From 213d52280652560dfb6e05134e7e47277770513a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 24 Sep 2011 20:47:47 +0000
Subject: [PATCH] merge with trunk ignoring trunk change

svn path=/nixpkgs/branches/libpng15/; revision=29476