Merge branch 'feature-bench-rebased' into develop
authorFilippos Giannakos <philipgian@grnet.gr>
Thu, 14 Mar 2013 10:11:36 +0000 (12:11 +0200)
committerFilippos Giannakos <philipgian@grnet.gr>
Thu, 14 Mar 2013 10:11:36 +0000 (12:11 +0200)

Trivial merge