nixpkgs/pkgs/os-specific/linux/pmount
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
..
default.nix svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00