From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 3 Jun 2012 14:21:27 +0000 (+0100)
Subject: Merge branch 'master' into newacpi
X-Git-Tag: debian/4.1.31~34
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=aa62ee22238449d01ec04084f6f873553f0b0c87

Merge branch 'master' into newacpi
---

aa62ee22238449d01ec04084f6f873553f0b0c87