Merge branch 'master' of ssh://ciapino/root/zavai
authorEnrico Zini <enrico@enricozini.org>
Fri, 26 Mar 2010 18:17:47 +0000 (18:17 +0000)
committerEnrico Zini <enrico@enricozini.org>
Fri, 26 Mar 2010 18:17:47 +0000 (18:17 +0000)

Trivial merge