Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 24 Sep 2012 13:26:21 +0000 (15:26 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Mon, 24 Sep 2012 13:26:21 +0000 (15:26 +0200)

Trivial merge