Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
authorroot <root@VMipfire.pfeiffer-privat.de>
Thu, 12 Nov 2009 09:10:27 +0000 (10:10 +0100)
committerroot <root@VMipfire.pfeiffer-privat.de>
Thu, 12 Nov 2009 09:10:27 +0000 (10:10 +0100)

Trivial merge