merged from trunk v0.6.2.9
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sun, 26 Jun 2011 15:41:35 +0000 (15:41 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sun, 26 Jun 2011 15:41:35 +0000 (15:41 +0000)

Trivial merge