Merge branch '3.09.2rc1'
authorSamuel Mimram <smimram@debian.org>
Sun, 16 Apr 2006 23:31:48 +0000 (23:31 +0000)
committerSamuel Mimram <smimram@debian.org>
Sun, 16 Apr 2006 23:31:48 +0000 (23:31 +0000)

Trivial merge