Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 9 Oct 2013 13:25:33 +0000 (15:25 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Wed, 9 Oct 2013 13:25:33 +0000 (15:25 +0200)

Trivial merge