[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Fri, 15 Oct 2010 07:53:08 +0000 (13:23 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Fri, 15 Oct 2010 07:53:08 +0000 (13:23 +0530)
bzr revid: mra@mra-laptop-20101015075308-tgxf9p305vgzcpq2


Trivial merge