Pelargonium graveolens, Rose-scented geranium

Rose-scented geranium
Pelargonium graveolens

Hardiness: Zones 10-11
Plant type: Annual, tender perennial
Height: 1- 3'
Spread: 1- 2'
Sun: Full sun
Water: Average, but will not tolerate standing water 
Bloom time: Late spring to early fall
Bloom color:  Pink to white
Soil: Well draining soil, loose soil, not too rich

More information on this plant here.