Merge commit 'upstream/0.5.0'
authorJulien Lavergne <julien.lavergne@gmail.com>
Tue, 26 Oct 2010 03:26:00 +0000 (23:26 -0400)
committerJulien Lavergne <julien.lavergne@gmail.com>
Tue, 26 Oct 2010 03:26:00 +0000 (23:26 -0400)

Trivial merge