[Pkg-acpi-devel] git conflicts

[Michael Meskes]

Sorry Loic,

apparently we were working on the archive at exactly the same time. I merged
the changes, however, I undid some of yours. There is a reason for not using
the Ubuntu directory unconditionally. Could you please have a look at my
changes and tell me if this is okay with you?

Yes, I know, I already uplaoded it, but sending a -14 directly afterwards
shouldn't be too much of a problem.

Michael
-- 
Michael Meskes
Michael at Fam-Meskes dot De, Michael at Meskes dot (De|Com|Net|Org)
Michael at BorussiaFan dot De, Meskes at (Debian|Postgresql) dot Org
ICQ: 179140304, AIM/Yahoo: michaelmeskes, Jabber: meskes at jabber.org
Go VfL Borussia! Go SF 49ers! Use Debian GNU/Linux! Use PostgreSQL!