[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 19 Oct 2010 05:06:05 +0000 (10:36 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 19 Oct 2010 05:06:05 +0000 (10:36 +0530)
commit91cf831cddc70d2be17fb195bf0d3dcc16652c09
tree2f229187f20293884858e123b694edd7ab3fd659
parent3e828804235ee9a7865990d9dab12910a2a61185
parent4ac7245cd19d0004119156523fc9dc06951af5f0
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101019050605-8aerdfmt2a7i4x8t