[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 28 Sep 2010 04:59:27 +0000 (10:29 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 28 Sep 2010 04:59:27 +0000 (10:29 +0530)
bzr revid: mra@mra-laptop-20100928045927-kcofzw0ume6s9kth


Trivial merge