Merge remote-tracking branch 'origin/stable' into stable
authorVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Fri, 29 Jun 2012 15:21:14 +0000 (18:21 +0300)
committerVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Fri, 29 Jun 2012 15:21:14 +0000 (18:21 +0300)

Trivial merge