Looks like Salvia dorii, desert Sage. The leaves are very small but very aromatic. It grows in disturbed areas -- must be invasive since the desert here.
I agree it looks like a Salvia but can't say which one. If you don't get an answer here soon you might try Las Pilitas Nursery. They are usually good about answering e-mail. HTH Chris
