Merge branch 'master' into debian-precise
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 17 Jul 2013 12:53:39 +0000 (15:53 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 17 Jul 2013 12:53:39 +0000 (15:53 +0300)

Trivial merge