Merge remote-tracking branch 'origin/master' into newstyles
authorOlga Brani <olgabrani@grnet.gr>
Tue, 31 Jul 2012 13:57:21 +0000 (16:57 +0300)
committerOlga Brani <olgabrani@grnet.gr>
Tue, 31 Jul 2012 13:57:21 +0000 (16:57 +0300)

Trivial merge