Commit 1a0be9da2363a0230e5012d1739997c3be323512
authorMichel Pollet <buserror@gmail.com>
Wed, 9 Mar 2011 07:56:50 +0000 (07:56 +0000)
committerMichel Pollet <buserror@gmail.com>
Wed, 9 Mar 2011 07:56:50 +0000 (07:56 +0000)

Trivial merge