Merge trunk
commit9f0c87dc52dcedc5da650bfb4a42f94f5bb74f0c
authorYury G. Kudryashov <urkud.urkud@gmail.com>
Thu, 15 Dec 2011 21:32:16 +0000 (15 21:32 +0000)
committerYury G. Kudryashov <urkud.urkud@gmail.com>
Thu, 15 Dec 2011 21:32:16 +0000 (15 21:32 +0000)
treebca13c65b6c72bb281b2b0116a753608a9f76b35
parent6d1954d2402ed4358567f6af63fe96315d6898c8
parent05f5c8802e5dc9533e9a108f5c91c8a259df0f8f
Merge trunk

svn path=/nixpkgs/branches/drop-kde4.5/; revision=30919
pkgs/top-level/all-packages.nix