[MERGE] Merge with trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 14 Sep 2010 13:50:44 +0000 (19:20 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 14 Sep 2010 13:50:44 +0000 (19:20 +0530)
commitf10b280e4d214d4e8301748229bbd244710605a5
tree2706598b10d6789c5a546dae85a93a590f2343a1
parent98006b583eebb37b873924f563752bf86449bb8c
parentd57d18e789c9e160d801e6e134d80dd67a6da3e6
[MERGE] Merge with trunk addons

bzr revid: mra@mra-laptop-20100914135044-nc0jlpn5pkk1p67i