Merge branch 'master' into perl_5.12.2
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Jan 2011 07:48:56 +0000 (08:48 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Jan 2011 07:48:56 +0000 (08:48 +0100)

Trivial merge