Merge branch 'master' into ubuntu
authorNikos Skalkotos <skalkoto@grnet.gr>
Mon, 27 May 2013 13:18:38 +0000 (16:18 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Mon, 27 May 2013 13:18:38 +0000 (16:18 +0300)

Trivial merge