Merge remote branch 'origin/stable' into stable
authorVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Wed, 10 Mar 2010 08:41:37 +0000 (10:41 +0200)
committerVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Wed, 10 Mar 2010 08:41:37 +0000 (10:41 +0200)

Trivial merge