Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorJan Paul Tuecking <earl@ipfire.org>
Sat, 20 Jun 2009 15:22:10 +0000 (17:22 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Sat, 20 Jun 2009 15:22:10 +0000 (17:22 +0200)

Trivial merge