I spent some time looking for something which might match the leaves and habit, the stems don't look to be square so Lamiaceae wouldn't fit unless we just can't see that they are squarish.
http://en.wikipedia.org/wiki/L...
magnus, could you tell us if the stems are square, and if the leaves are scented?
to ATP by the way.