Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x
authorPeter Pfeiffer <peterman@ipfire.org>
Fri, 22 May 2009 17:52:41 +0000 (19:52 +0200)
committerPeter Pfeiffer <peterman@ipfire.org>
Fri, 22 May 2009 17:52:41 +0000 (19:52 +0200)

Trivial merge