Merge branch 'master' into ubuntu
authorNikos Skalkotos <skalkoto@grnet.gr>
Thu, 25 Apr 2013 15:07:20 +0000 (18:07 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Thu, 25 Apr 2013 15:07:20 +0000 (18:07 +0300)

Trivial merge