Merge branch 'unstable'
authorAntonio Ospite <ospite@studenti.unina.it>
Mon, 26 Mar 2012 11:49:31 +0000 (13:49 +0200)
committerAntonio Ospite <ospite@studenti.unina.it>
Mon, 26 Mar 2012 11:49:31 +0000 (13:49 +0200)

Trivial merge