merge with mainline
authorBVK Chaitanya <bvk.groups@gmail.com>
Thu, 22 Jul 2010 17:09:20 +0000 (22:39 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Thu, 22 Jul 2010 17:09:20 +0000 (22:39 +0530)

Trivial merge