add bash-4.2 patches 25 through 39
Merge remote-tracking branch 'upstream/master' into bash.121120
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Applied to wrong branch.
Revert "add bash-4.2 patches 25 through 39"

This reverts commit b6c5b9806f6ae79652336a7cfb51fe0f03d0590a.
Merge https://github.com/jcumming/nixpkgs into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
x86info-1.30
Merge remote-tracking branch 'upstream/master' into x86info.130109
Update x86info description. Add Homepage.
Merge pull request #254 from jcumming/x86info.130109

X86info.130109
haskell-cipher-aes: update to version 0.1.7
haskell-cprng-aes: update to version 0.3.4
haskell-gitit: update to version 0.10.1.2
haskell-http-conduit: update to version 1.8.6.3
haskell-libmpd: update to version 0.8.0.2
haskell-reactive-banana: update to version 0.7.1.1
haskell-wai-extra: update to version 1.3.2
smartmontools: update drive database to the latest version