Merge commit 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 27 Nov 2010 00:18:29 +0000 (01:18 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 27 Nov 2010 00:18:29 +0000 (01:18 +0100)
commit504d0a27d2dca40436d2807cea78bb908b8fa68b
tree94bff818f3f5618a83a15cb12db230721487abc9
parent94571564362b2583f2aed6a4f49c577774fe7928
parent9d80adf1b463c0b730df93bf727a5dde51df4bcd
Merge commit 'origin/next'

Conflicts:
make.sh
make.sh