Merge remote branch 'origin/acpi' into chouffe
authorErwan Velu <erwan.velu@free.fr>
Mon, 7 Dec 2009 09:48:20 +0000 (10:48 +0100)
committerErwan Velu <erwan.velu@free.fr>
Mon, 7 Dec 2009 09:48:20 +0000 (10:48 +0100)

Trivial merge