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

Trivial merge