Merge branch 'devel-2.1' into stable-2.1
authorIustin Pop <iustin@google.com>
Tue, 12 Jan 2010 10:24:03 +0000 (11:24 +0100)
committerIustin Pop <iustin@google.com>
Tue, 12 Jan 2010 10:24:03 +0000 (11:24 +0100)
commitb13dfb92ab93b63c3feb238d27e8b5cd2a495fce
tree7b6404c89b3ce2ae733232716666fecbdc45032a
parentb8313b298dc11f189ab3da6bf625ce1e1350cfb4
parent8218713518c25baa5aeb97e7cbb0a78c1c292fa7
Merge branch 'devel-2.1' into stable-2.1