Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 10 Feb 2014 14:20:38 +0000 (15:20 +0100)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 10 Feb 2014 14:20:38 +0000 (15:20 +0100)

Trivial merge