Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Apr 2011 08:39:08 +0000 (10:39 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Apr 2011 08:39:08 +0000 (10:39 +0200)
Conflicts:
config/rootfiles/core/49/filelists/files


Trivial merge