[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Fri, 28 Jan 2011 08:30:36 +0000 (14:00 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Fri, 28 Jan 2011 08:30:36 +0000 (14:00 +0530)
bzr revid: mra@mra-laptop-20110128083036-yd77dhpcilqw0ns9


Trivial merge