Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Thu, 3 Dec 2009 22:35:28 +0000 (22:35 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Thu, 3 Dec 2009 22:35:28 +0000 (22:35 +0000)
commitb57654e6e7ffd90785f6f689786f9564f6f48eb6
tree0cba78ed8b721f1732cc36b0c252bbbd3c4ffa17
parentbbd0c1f47a633740ce467e11113c1edf5df52829
parent814d59e31b173fe687d26f073a8cc57fd4485c84
Merge branch 'stable'