Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 26 Sep 2013 08:22:55 +0000 (10:22 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 26 Sep 2013 08:22:55 +0000 (10:22 +0200)

Trivial merge