[Nix-dev] Merge libpng15

[Yury G. Kudryashov]

Hi!

I failed to merge branches/libpng15 into branches/stdenv-updates using svn 
merge. I see two ways:
1. Merge libpng15 into trunk.
2. Merge libpng15 into stdenv-updates using git merge. In this case svn will 
see one commit without any mergeinfo.

Unless someone objects, I'll do the first in 1 week.
P.S.: Eelco, could you please update "trunk vs libpng15" hydra job failures 
table?
-- 
Yury G. Kudryashov,
mailto: urkud at mccme.ru