Vladimír Čunát 7e0b78f7b2 Merge master into x-updates ... Conflicts (re-created on master, preserved): pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch		2014-01-23 22:52:18 +01:00
..
xorg	Merge master into x-updates	2014-01-23 22:52:18 +01:00