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)
1  2 
config/rootfiles/oldcore/48/exclude

Simple merge