Merge 0.8->trunk.
authorWaqas Hussain <waqas20@gmail.com>
Wed, 2 Mar 2011 00:15:54 +0000 (05:15 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Wed, 2 Mar 2011 00:15:54 +0000 (05:15 +0500)
commitd5d148475552413a3d3db184229395bbb00a71b5
tree397f7f3f8691fc18674914123a2e1e39da7647a1
parent12ce18c8216a917da7e9c6dd10b3d987596b525f
parent780c88880fad7b6135c4411a9e27e5887c1300ae
Merge 0.8->trunk.