Merge branch 'deploy'
authorFlavio Poletti <flavio@polettix.it>
Fri, 8 Aug 2008 17:28:26 +0000 (8 19:28 +0200)
committerFlavio Poletti <flavio@polettix.it>
Fri, 8 Aug 2008 17:28:26 +0000 (8 19:28 +0200)

Trivial merge