Merged from fil
authorEnrico Zini <enrico@enricozini.org>
Tue, 13 Oct 2009 08:52:48 +0000 (09:52 +0100)
committerEnrico Zini <enrico@enricozini.org>
Tue, 13 Oct 2009 08:52:48 +0000 (09:52 +0100)

Trivial merge