Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Thu, 17 Dec 2009 23:31:50 +0000 (23:31 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Thu, 17 Dec 2009 23:31:50 +0000 (23:31 +0000)
commitddfdced94e9921382e8b2e90cb17df4bdb2273dc
treee0014d643de356c26489ce6f35936608f8784cd7
parentda30db2adfb74c19189b7d9ae7658a0a799a3945
parent085481eaeefb88b5cd5e5e2bdac17f2deab57127
Merge branch 'stable'