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)
commite876d78e8e6eff7411f087ce799383f7e145b28c
treeb41d5ece8db138b7bd33336ccfc70dc513152fed
parent4d02776cce49be45c2b2ea3b1b70b1dd5eb961a6
parente96398e3b9cc978bad0999d256afb322fb5ed203
Merge remote branch 'origin/acpi' into chouffe