Merge branch 'master' into debian
authorNikos Skalkotos <skalkoto@grnet.gr>
Fri, 2 Nov 2012 11:49:33 +0000 (13:49 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Fri, 2 Nov 2012 11:49:33 +0000 (13:49 +0200)

Trivial merge