Merge branch 'clock' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Mon, 9 Apr 2012 17:27:38 +0000 (10:27 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 9 Apr 2012 17:27:38 +0000 (10:27 -0700)

Trivial merge