[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Mon, 27 Sep 2010 12:59:21 +0000 (18:29 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Mon, 27 Sep 2010 12:59:21 +0000 (18:29 +0530)
bzr revid: mra@mra-laptop-20100927125921-urvuknouixjnxqix


Trivial merge