merge with mainline
authorBVK Chaitanya <bvk.groups@gmail.com>
Sun, 18 Jul 2010 16:04:03 +0000 (21:34 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Sun, 18 Jul 2010 16:04:03 +0000 (21:34 +0530)

Trivial merge