svn when files were removed, recreated and whatever... svn merge -r 18479:18485 ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18659
svn when files were removed, recreated and whatever... svn merge -r 18479:18485 ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18659