Yury G. Kudryashov e5917ea6fc Merge with udev-173
The only conflict was the addition of two different options at the same place.

svn path=/nixos/trunk/; revision=28801
2011-08-24 21:24:39 +00:00
..
2011-08-24 21:24:39 +00:00
2009-12-16 20:51:25 +00:00