merge with mainline
authorBVK Chaitanya <bvk.groups@gmail.com>
Sun, 19 Dec 2010 03:47:22 +0000 (09:17 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Sun, 19 Dec 2010 03:47:22 +0000 (09:17 +0530)

Trivial merge