Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Tue, 25 Mar 2008 20:40:22 +0000 (20:40 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Tue, 25 Mar 2008 20:40:22 +0000 (20:40 +0000)

Trivial merge