Merge branch 'devel-2.2' into devel-2.3
authorIustin Pop <iustin@google.com>
Wed, 24 Nov 2010 17:01:57 +0000 (17:01 +0000)
committerIustin Pop <iustin@google.com>
Wed, 24 Nov 2010 17:02:01 +0000 (17:02 +0000)
commitb6ac86e0aa4d80161a36575c0719707e3e416e99
tree82009bfc770dd4d297d89a35979e55e4079f6f1d
parentca6c2dcd3e4ab1eee4651d41de21c9ef3e2e115e
parent577b170b61f1ec9de1c9287cfe828f13b03683bc
Merge branch 'devel-2.2' into devel-2.3

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