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
..
2011-10-30 16:06:47 +00:00
2011-09-24 02:49:04 +00:00
2011-08-15 08:34:46 +00:00
2011-09-09 19:35:31 +00:00
2011-09-02 15:11:52 +00:00
2011-09-03 13:17:23 +00:00
2011-12-26 15:35:30 +00:00
2011-11-13 01:38:03 +00:00
2011-09-09 19:43:04 +00:00
2011-09-20 20:30:20 +00:00
2011-12-25 05:47:23 +00:00
2011-09-21 16:46:54 +00:00
2012-01-02 14:12:40 +00:00
2011-12-21 10:49:34 +00:00
2011-11-28 18:12:06 +00:00
2011-10-19 16:37:05 +00:00
2011-10-11 22:18:21 +00:00