[MEREG] Merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Mon, 4 Oct 2010 10:46:35 +0000 (16:16 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Mon, 4 Oct 2010 10:46:35 +0000 (16:16 +0530)
bzr revid: mra@mra-laptop-20101004104635-e7lpsym83x7rymqf


Trivial merge