Merge branch 'master' into core50
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 7 Jul 2011 19:57:36 +0000 (21:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 7 Jul 2011 19:57:36 +0000 (21:57 +0200)
Conflicts:
config/rootfiles/core/50/filelists/icons


Trivial merge