Merge branch 'master' of ssh://ciapino/root/zavai
authorEnrico Zini <enrico@enricozini.org>
Sun, 28 Mar 2010 11:14:51 +0000 (12:14 +0100)
committerEnrico Zini <enrico@enricozini.org>
Sun, 28 Mar 2010 11:14:51 +0000 (12:14 +0100)

Trivial merge