From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 19 May 2012 20:50:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/pixman'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=320df0d20b508ba0666089ac9208d3790c44eece;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/pixman'
---

320df0d20b508ba0666089ac9208d3790c44eece