Merge.
authorCharles-François Natali <cf.natali@gmail.com>
Mon, 16 Dec 2013 12:49:30 +0000 (13:49 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Mon, 16 Dec 2013 12:49:30 +0000 (13:49 +0100)

Trivial merge