Commit f9b556eb54397ec4872130b7132ea5d5ac2b0a97
authorMichel Pollet <buserror@gmail.com>
Sun, 20 Feb 2011 10:20:52 +0000 (10:20 +0000)
committerMichel Pollet <buserror@gmail.com>
Sun, 20 Feb 2011 10:20:52 +0000 (10:20 +0000)

Trivial merge