Merge remote branch 'origin/stable' into stable
authorVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Fri, 5 Mar 2010 20:11:16 +0000 (22:11 +0200)
committerVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Fri, 5 Mar 2010 20:11:16 +0000 (22:11 +0200)

Trivial merge