From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 9 Dec 2011 12:48:22 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~44
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=32fe963d1e884cbe0016ca880212111a1ba94e42;p=deb_libcec.git

Merge branch 'master' into release
---

32fe963d1e884cbe0016ca880212111a1ba94e42