From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sun, 2 Oct 2011 10:11:18 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~118^2~14
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=175d5c4f566f7e978aeb137f8721c5ec5fa90fd3;p=deb_libcec.git

Merge branch 'master' into release
---

175d5c4f566f7e978aeb137f8721c5ec5fa90fd3