merged v0.6.1.x
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 26 Apr 2011 20:35:34 +0000 (20:35 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 26 Apr 2011 20:35:34 +0000 (20:35 +0000)

Trivial merge