merge from stable branch 5.0
authorvra (Tiny) <vinusoft85@gmail.com>
Mon, 8 Jun 2009 04:12:41 +0000 (09:42 +0530)
committervra (Tiny) <vinusoft85@gmail.com>
Mon, 8 Jun 2009 04:12:41 +0000 (09:42 +0530)
bzr revid: vinusoft85@gmail.com-20090608041241-c80vmafj7rjcsuaa


Trivial merge