NixOS/nixpkgs — pull request #48 by shlevy (2012-07-14 18:43:10+00:00)
Title: X updates

Merged from master and updated x.org to 7.7, not sure if I should push this kind of thing directly when it's just a branch.