[MERGE] Merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Fri, 27 Aug 2010 03:43:19 +0000 (09:13 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Fri, 27 Aug 2010 03:43:19 +0000 (09:13 +0530)
bzr revid: mra@mra-laptop-20100827034319-td2ra7glt8f1yzr1


Trivial merge