Merge 0.9->trunk.
authorWaqas Hussain <waqas20@gmail.com>
Mon, 3 Dec 2012 01:07:00 +0000 (06:07 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Mon, 3 Dec 2012 01:07:00 +0000 (06:07 +0500)
commit404520e9a97dfa0abf67cca6d2dfc96154584e4a
treec4dbfdf5f9bd38e7022e53aa7fc68367deb04ceb
parentd6687b96a24cf138b62170c5e24b10e46f4dc798
parentcf9d5a66f973938fa857d601f688fe0cfa4f5a0b
Merge 0.9->trunk.