Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Oct 2010 10:05:20 +0000 (12:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Oct 2010 10:05:20 +0000 (12:05 +0200)
commit748837e6ea86c62f83b9775b41e2e6b145bff5c0
tree1aecbeb148db5860d55850c260e29b745f4d56d0
parent5ea81cd5309792d112294627a74ae295645d69cb
parent9c2941ee78c8462065a0b42e780f5042f27103c9
Merge commit 'origin/master' into next

Conflicts:
config/rootfiles/core/41/filelists/files
doc/packages-list.txt