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)

Trivial merge