Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorJan Paul Tuecking <earl@ipfire.org>
Thu, 16 Jul 2009 15:50:06 +0000 (17:50 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Thu, 16 Jul 2009 15:50:06 +0000 (17:50 +0200)

Trivial merge