Merge branch 'master' into debian
authorAntonio Ospite <ospite@studenti.unina.it>
Sun, 27 Nov 2011 11:25:05 +0000 (12:25 +0100)
committerAntonio Ospite <ospite@studenti.unina.it>
Sun, 27 Nov 2011 11:25:05 +0000 (12:25 +0100)

Trivial merge