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)
commit0ae7d41310781fd7370ae4f0c8365da0e6d87e16
tree6eee85a457dc42d689f06d530c9042d190e0ebb0
parenta535cef7f3c4e69985b17a60004566fc9a5c7eb2
parentb6ac86e0aa4d80161a36575c0719707e3e416e99
Merge branch 'devel-2.3'

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>