From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 12 Apr 2011 11:55:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/acpid'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbd85b5489a4fef875682f0ad189a771f636cf67;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/acpid'
---

cbd85b5489a4fef875682f0ad189a771f636cf67