Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorJan Paul Tuecking <earl@ipfire.org>
Sun, 18 Apr 2010 20:45:18 +0000 (22:45 +0200)
committerJan Paul Tuecking <earl@ipfire.org>
Sun, 18 Apr 2010 20:45:18 +0000 (22:45 +0200)

Trivial merge