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

Merge branch 'master' into release
---

48a229b119ab50aab51bfaefe8b5930204ea2dcf