[MERGE] stable-2.3 into devel-2.3

[Michael Hanselmann]

commit c00d5544432699973f1bd1caf205a00236e332d2
Merge: e1137eb 563d5e7
Author: Michael Hanselmann <han...@google.com>
Date:   Thu Dec 2 16:47:56 2010 +0100

    Merge branch 'stable-2.3' into devel-2.3
    
    * stable-2.3:
      Bump version for 2.3.1~rc1 release