From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Thu, 17 May 2012 11:02:42 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~27
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ae0f8fe4a09c5a4a3bb8fef267c6146d6df9d1e0;hp=--cc;p=deb_libcec.git

Merge branch 'master' into release
---

ae0f8fe4a09c5a4a3bb8fef267c6146d6df9d1e0