Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im