Merge 0.7->trunk
authorWaqas Hussain <waqas20@gmail.com>
Thu, 6 May 2010 12:14:11 +0000 (17:14 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Thu, 6 May 2010 12:14:11 +0000 (17:14 +0500)
commitb94a87ecc79ae2329b0ffef9752ab1b4f49db5ed
tree606859b5659d850d800c566536e6a38cc5bafe66
parentc71da57be96c1a8299aeb1d3da83314d5be78ef0
parentf672c8647e3ad1a808c412e8d37ee10fe5122ab2
Merge 0.7->trunk