Merge branch 'master' into ubuntu
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 1 May 2013 17:39:08 +0000 (20:39 +0300)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 1 May 2013 17:39:08 +0000 (20:39 +0300)

Trivial merge