[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Mon, 25 Oct 2010 13:19:14 +0000 (18:49 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Mon, 25 Oct 2010 13:19:14 +0000 (18:49 +0530)
commit769c01279d9a310b9dd49e8eb08a44c0f7f69f09
tree87732d763b165f2fec748c3650168d9cb3b44097
parent1a6b6a9af8c5c316243b3ff6be77e45832d18228
parent320cd68fdc4f104fc6ea867a0df22507c47c6b30
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101025131914-2t4p39zjop7hnuxy