Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Jun 2011 22:01:26 +0000 (00:01 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Jun 2011 22:01:26 +0000 (00:01 +0200)
commit1afed8d21d28aa498beef8fb29932754259eb556
tree999baf27a05942e8fea65f068e23647a836cdf0c
parentee11332d40ab1482cf9a89f6aaf6cb49d56c9726
parent88af830315fbb554192944d47dc4ab6be642e02b
Merge branch 'master' into next
config/rootfiles/oldcore/48/exclude