Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
authorPeter Pfeiffer <peterman@ipfire.org>
Sun, 6 Sep 2009 09:20:38 +0000 (11:20 +0200)
committerPeter Pfeiffer <peterman@ipfire.org>
Sun, 6 Sep 2009 09:20:38 +0000 (11:20 +0200)

Trivial merge