Merge branch 'devel-2.3'
authorIustin Pop <iustin@google.com>
Wed, 24 Nov 2010 17:12:38 +0000 (17:12 +0000)
committerIustin Pop <iustin@google.com>
Wed, 24 Nov 2010 17:12:39 +0000 (17:12 +0000)
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>


Trivial merge