Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
authorroot <root@ipfire.localdomain>
Sun, 5 Apr 2009 12:50:12 +0000 (14:50 +0200)
committerroot <root@ipfire.localdomain>
Sun, 5 Apr 2009 12:50:12 +0000 (14:50 +0200)

Trivial merge