From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 11 Nov 2011 22:36:53 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~46
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=8f29b7e16395fe448c235ed793e93cb19cafe02c;p=deb_libcec.git

Merge branch 'master' into release
---

8f29b7e16395fe448c235ed793e93cb19cafe02c