[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Fri, 22 Oct 2010 04:51:28 +0000 (10:21 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Fri, 22 Oct 2010 04:51:28 +0000 (10:21 +0530)
bzr revid: mra@mra-laptop-20101021131113-0b4qnurympyrtyet
bzr revid: mra@mra-laptop-20101022045128-vcrcs3pvlhdi971p


Trivial merge