merging
authorlekernel <sebastien.bourdeauducq@lekernel.net>
Mon, 9 Nov 2009 21:00:26 +0000 (22:00 +0100)
committerlekernel <sebastien.bourdeauducq@lekernel.net>
Mon, 9 Nov 2009 21:00:26 +0000 (22:00 +0100)

Trivial merge