Merge
authorSaverio Proto <zioproto@gmail.com>
Tue, 30 Jun 2009 09:35:36 +0000 (11:35 +0200)
committerSaverio Proto <zioproto@gmail.com>
Tue, 30 Jun 2009 09:35:36 +0000 (11:35 +0200)

Trivial merge