From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sat, 8 Oct 2011 01:25:59 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~118^2~9
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ef142e7990584120ba1ca645629cdc6e8d61d5c4;p=deb_libcec.git

Merge branch 'master' into release
---

ef142e7990584120ba1ca645629cdc6e8d61d5c4