Merge branch 'smp-fix'
Russell King [Sun, 17 May 2009 16:13:18 +0000 (17:13 +0100)]

Trivial merge