merge.
authorRalf Corsépius <corsepiu@fedoraproject.org>
Tue, 30 Oct 2007 14:25:41 +0000 (15:25 +0100)
committerRalf Corsépius <corsepiu@fedoraproject.org>
Tue, 30 Oct 2007 14:25:41 +0000 (15:25 +0100)

Trivial merge