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)

Trivial merge