Merge branch 'devel-timer' into devel-cleanup
authorTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2011 10:35:18 +0000 (03:35 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2011 10:35:18 +0000 (03:35 -0700)

Trivial merge