Merge branch 'master' into debian
authorAntonio Ospite <ospite@studenti.unina.it>
Fri, 23 Sep 2011 11:37:12 +0000 (13:37 +0200)
committerAntonio Ospite <ospite@studenti.unina.it>
Fri, 23 Sep 2011 11:37:12 +0000 (13:37 +0200)

Trivial merge