merge from v0.6.1.x
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 29 Apr 2011 07:41:03 +0000 (07:41 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 29 Apr 2011 07:41:03 +0000 (07:41 +0000)

Trivial merge