Merge remote-tracking branch 'watchdog/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:28:23 +0000 (12:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:28:23 +0000 (12:28 +1000)

Trivial merge