Shea Levy c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates ... mountall conflict was trivial Conflicts: pkgs/os-specific/linux/mountall/default.nix		2012-07-14 14:24:27 -04:00
..
cacert	cacert: Update to 20120628	2012-07-05 17:31:23 -04:00
gsettings-desktop-schemas
hicolor-icon-theme
iana-etc
miscfiles
mobile-broadband-provider-info
poppler-data
shared-desktop-ontologies
shared-mime-info	shared-mime-info-1.0	2012-03-31 21:29:12 +00:00
themes
xkeyboard-config	* xkeyboard-config updated to 2.5.1.	2012-05-15 21:30:03 +00:00