merge with mainline
authorBVK Chaitanya <bvk.groups@gmail.com>
Sun, 11 Jul 2010 12:40:53 +0000 (18:10 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Sun, 11 Jul 2010 12:40:53 +0000 (18:10 +0530)

Trivial merge