[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Tue, 26 Oct 2010 05:17:54 +0000 (10:47 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Tue, 26 Oct 2010 05:17:54 +0000 (10:47 +0530)
commit1197af2134efd4cad092525a753e2a7dc8f539df
tree12c7c7c8ccdfb519fdc83081132648ceae6a123e
parent4aaa3a4354926dd3c4b9def8844853da1df5f8d2
parentbeae37adb04148470f41985c76e556b28de40d4b
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101026051754-ou0xv1usmxlnyt7m