Merge branch 'devel-stable' into devel
authorRussell King <[email protected]>
Thu, 28 Oct 2010 19:39:13 +0000 (20:39 +0100)
committerRussell King <[email protected]>
Thu, 28 Oct 2010 19:39:13 +0000 (20:39 +0100)

Trivial merge