From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 7 Jul 2013 20:14:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/libjpeg-fix'
X-Git-Tag: pango~197^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bb0cf724e1aac823f9c1fb752b2f5699fb8ea6b;p=people%2Fstevee%2Fipfire-3.x.git

Merge remote-tracking branch 'stevee/libjpeg-fix'
---

3bb0cf724e1aac823f9c1fb752b2f5699fb8ea6b