From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Mon, 16 Apr 2012 16:45:01 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~31
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=1bede530033f40a81400c7a1e4ed0e8755d4ec59;p=deb_libcec.git

Merge branch 'master' into release
---

1bede530033f40a81400c7a1e4ed0e8755d4ec59