Merge branch 'master' into perl_5.12.2
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 Feb 2011 16:37:07 +0000 (17:37 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 20 Feb 2011 16:37:07 +0000 (17:37 +0100)
commit4200583c7084c8a048ce9b568bac62a8a4e8bcb1
tree200389dbf896b1c2a37e5fc325ca48bd9eaf5ff2
parent8706303057c528cb825857e6d5fe048571ce8d4a
parentbf8416a2ca1d27ce00d5520e19b875511166b8f6
Merge branch 'master' into perl_5.12.2

Conflicts:
config/rootfiles/core/47/filelists/files
config/rootfiles/core/47/update.sh
config/rootfiles/core/46/update.sh