Merge branch 'master' into perl_5.12.2
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 19 Jan 2011 23:17:35 +0000 (00:17 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 19 Jan 2011 23:17:35 +0000 (00:17 +0100)

Trivial merge