Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 20 Sep 2012 05:45:00 +0000 (07:45 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 20 Sep 2012 05:45:00 +0000 (07:45 +0200)
commite0027e6cdc8fb4b7849430aa805a0314fef2b6a7
treeb8f9a4185a5968c2067fc3dd751bf051a3c6d386
parentc7961db8ed1127db476d0063998335e14323671f
parent6de056b1de4b8dc507a54dc8200c94d4dff0841c
Merge remote-tracking branch 'origin/next' into thirteen

Conflicts:
config/rootfiles/core/52/meta
config/rootfiles/core/53/filelists/strongswan
config/rootfiles/core/53/meta
config/rootfiles/core/54/filelists/strongswan
config/rootfiles/core/54/meta
config/rootfiles/core/55/exclude
config/rootfiles/core/55/meta
config/rootfiles/core/56/exclude
config/rootfiles/core/56/meta
config/rootfiles/core/57/exclude
config/rootfiles/core/57/filelists/strongswan
config/rootfiles/core/57/meta
config/rootfiles/core/58/exclude
config/rootfiles/core/58/filelists/strongswan
config/rootfiles/core/58/meta
config/rootfiles/core/59/exclude
config/rootfiles/core/59/filelists/strongswan
config/rootfiles/core/59/meta
config/rootfiles/core/strongswan/exclude
config/rootfiles/core/strongswan/filelists/strongswan
config/rootfiles/core/strongswan/meta
config/rootfiles/oldcore/52/meta
config/rootfiles/oldcore/53/filelists/strongswan
config/rootfiles/oldcore/53/meta
config/rootfiles/oldcore/54/filelists/strongswan
config/rootfiles/oldcore/54/meta
config/rootfiles/oldcore/55/exclude
config/rootfiles/oldcore/55/meta
config/rootfiles/oldcore/56/exclude
config/rootfiles/oldcore/56/meta
config/rootfiles/oldcore/57/exclude
config/rootfiles/oldcore/57/filelists/strongswan
config/rootfiles/oldcore/57/meta
config/rootfiles/oldcore/58/exclude
config/rootfiles/oldcore/58/filelists/strongswan
config/rootfiles/oldcore/58/meta
config/rootfiles/oldcore/59/exclude
config/rootfiles/oldcore/59/filelists/strongswan
config/rootfiles/oldcore/59/meta
lfs/dhcp
lfs/dhcp
lfs/inetutils
lfs/minidlna
make.sh