Merge branch 'master' into perl_5.12.2
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 29 Jan 2011 20:38:06 +0000 (21:38 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 29 Jan 2011 20:38:06 +0000 (21:38 +0100)

Trivial merge