From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 Oct 2012 13:08:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'ummeegge/cairo-update'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8568796d81f1208f1c651b5180f2038a9b21dc83;p=people%2Famarx%2Fipfire-3.x.git

Merge remote-tracking branch 'ummeegge/cairo-update'
---

8568796d81f1208f1c651b5180f2038a9b21dc83