Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorJan Paul Tuecking <earl@ipfire.org>
Wed, 23 Jun 2010 15:47:55 +0000 (17:47 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Wed, 23 Jun 2010 15:47:55 +0000 (17:47 +0200)

Trivial merge