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
vlada/ipe

Adding the ipe editor.

Signed-off-by: Vladimír Čunát <vcunat@gmail.com>
Merge pull request #242 from vcunat/vlada/ipe-notg

Add the ipe editor.
cryptsetup: Update to 1.5.1
systemd: Update to 197
systemd: Generate patches from my systemd Git repo
systemd: Get rescue.service and emergency.service to work
First attempt at packaging dd-agent
dd-agent: Move /usr stuff to  directly
systemd: Remove some plymouth calls
dd-agent: Add python so patchShebangs can patch python scripts
dd-agent: Propagate sysstat
dd-agent: Add meta
Merge branch 'dd-agent' into upstream