Merge remote branch 'origin/next' into arm-port
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Sep 2011 00:58:34 +0000 (02:58 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Sep 2011 00:58:34 +0000 (02:58 +0200)
commit7b321c2cbe910caeb0d5887cc4f4dc15836dd473
tree4e6605272b47a3615ded45abf0de46e07152d1f1
parent8e53bd3e29b9593470c0fe99ec1fae72deb4c2d8
parentcd0c0a0de72e975c87426642d09897aaf3d293e9
Merge remote branch 'origin/next' into arm-port

Conflicts:
config/rootfiles/common/i586/gcc
lfs/binutils
lfs/cleanup-toolchain
lfs/coreutils
lfs/gcc
lfs/glibc
lfs/groff
src/pakfire/pakfire.conf
src/patches/gcc-4.1.2-specs-1.patch
13 files changed:
config/rootfiles/common/i586/gcc
config/rootfiles/oldcore/51/update.sh
lfs/binutils
lfs/cleanup-toolchain
lfs/compat-wireless
lfs/coreutils
lfs/gcc
lfs/glibc
lfs/groff
lfs/kvm-kmod
lfs/qemu
make.sh
src/pakfire/pakfire.conf