svn path=/nixos/trunk/; revision=17475
svn path=/nixos/trunk/; revision=16687
* Refactored some other modules (dbus, hal). svn path=/nixos/trunk/; revision=16652