Merge remote-tracking branch 'origin/savagex/courtfun-sRGB'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 16 Jan 2012 19:48:38 +0000 (20:48 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 16 Jan 2012 19:48:38 +0000 (20:48 +0100)

Trivial merge