Merge 0.8->trunk.
authorWaqas Hussain <waqas20@gmail.com>
Sun, 20 Feb 2011 14:21:44 +0000 (19:21 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Sun, 20 Feb 2011 14:21:44 +0000 (19:21 +0500)
commit0ba1be1015d883c8dc6d1eed2ec84114af09ef6f
treec9bd74c6ac832b3d88a9b27a7d5b46fb1c911eaa
parent43bb3c3bb3a41275a235d6226c1757e298b40653
parentc6ba514283042545c66e20f12e844c1372a54d4c
Merge 0.8->trunk.