Merge remote branch 'origin/stable' into stable
authorVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Fri, 2 Jul 2010 09:17:21 +0000 (12:17 +0300)
committerVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Fri, 2 Jul 2010 09:17:21 +0000 (12:17 +0300)

Trivial merge