Merge branch 'master' into debian-precise
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 22 Aug 2013 10:34:44 +0000 (13:34 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 22 Aug 2013 10:34:44 +0000 (13:34 +0300)

Trivial merge