Merge branch 'mainstream'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 17 Aug 2013 13:08:21 +0000 (15:08 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Sat, 17 Aug 2013 13:08:21 +0000 (15:08 +0200)

Trivial merge