Merge commit '259e0b1ad1bfea762a76f0098deb8f8d8db1dfa3'
authorGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 15 Aug 2013 14:11:21 +0000 (16:11 +0200)
committerGiuseppe Lettieri <g.lettieri@iet.unipi.it>
Thu, 15 Aug 2013 14:11:21 +0000 (16:11 +0200)

Trivial merge