Merge commit '180c6d0b440961cbc873c4d045eb8b2daa1364e9'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 6 Jul 2013 16:05:12 +0000 (18:05 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 6 Jul 2013 16:05:12 +0000 (18:05 +0200)

Trivial merge