Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 20 Oct 2010 16:18:34 +0000 (18:18 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 20 Oct 2010 16:18:34 +0000 (18:18 +0200)
commit59093c5ec474be7eb22c17a8f1cb0c1922f1f93a
treed68bd576f1a2fcc81ab38be5309c7b8573649422
parent9d4e63229159a9e982774b04f1b3a5d651d62ab4
parent82a8499a6a05652886ab5ddbd82e536b6d8ed144
Merge commit 'origin/master' into next

Conflicts:
config/rootfiles/core/41/exclude
config/rootfiles/core/41/filelists/files