From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Wed, 25 Jan 2012 22:59:13 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~39
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=d0a712a65c05b4bf7bf25eafb8b4c999b6888a42;hp=-c;p=deb_libcec.git

Merge branch 'master' into release
---

d0a712a65c05b4bf7bf25eafb8b4c999b6888a42