Merge branch 'master' of ssh://peterman@git.ipfire.org/pub/git/ipfire-2.x
authorPeter Pfeiffer <peterman@ipfire.org>
Sat, 14 Mar 2009 13:01:32 +0000 (14:01 +0100)
committerPeter Pfeiffer <peterman@ipfire.org>
Sat, 14 Mar 2009 13:01:32 +0000 (14:01 +0100)

Trivial merge