Merge branch 'hotfix-0.14.5' into debian-hotfix-0.14.5
authorChristos Stavrakakis <cstavr@grnet.gr>
Wed, 25 Sep 2013 09:05:18 +0000 (12:05 +0300)
committerChristos Stavrakakis <cstavr@grnet.gr>
Wed, 25 Sep 2013 09:05:18 +0000 (12:05 +0300)

Trivial merge