Merge branch 'master' into ubuntu
authorNikos Skalkotos <skalkoto@grnet.gr>
Wed, 16 Jan 2013 19:15:47 +0000 (21:15 +0200)
committerNikos Skalkotos <skalkoto@grnet.gr>
Wed, 16 Jan 2013 19:15:47 +0000 (21:15 +0200)

Trivial merge