Merge branch 'smp-fix'
authorRussell King <[email protected]>
Sun, 17 May 2009 16:13:18 +0000 (17:13 +0100)
committerRussell King <[email protected]>
Sun, 17 May 2009 16:13:18 +0000 (17:13 +0100)

Trivial merge