Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 7 Sep 2013 13:48:06 +0000 (15:48 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 7 Sep 2013 13:48:06 +0000 (15:48 +0200)

Trivial merge