Merge branch 'clkdev' into fixes
Russell King [Wed, 19 Sep 2012 21:04:48 +0000 (22:04 +0100)]

Trivial merge