[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Fri, 4 Feb 2011 04:48:42 +0000 (10:18 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Fri, 4 Feb 2011 04:48:42 +0000 (10:18 +0530)
bzr revid: mra@mra-laptop-20110204044842-i79i51jfk3ti97b6

1  2 
addons/account/account.py

Simple merge