Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Oct 2009 22:05:34 +0000 (22:05 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Oct 2009 22:05:34 +0000 (22:05 +0000)

Trivial merge