Merge branch 'feature-bench-improvements-rebased2' into develop
authorFilippos Giannakos <philipgian@grnet.gr>
Thu, 18 Jul 2013 12:20:02 +0000 (15:20 +0300)
committerFilippos Giannakos <philipgian@grnet.gr>
Thu, 18 Jul 2013 12:20:02 +0000 (15:20 +0300)

Trivial merge