Merge branch 'devel-stable' into devel
authorRussell King <[email protected]>
Mon, 24 May 2010 22:08:52 +0000 (23:08 +0100)
committerRussell King <[email protected]>
Mon, 24 May 2010 22:08:52 +0000 (23:08 +0100)

Trivial merge