Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Wed, 12 May 2010 00:26:04 +0000 (17:26 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 May 2010 00:26:04 +0000 (17:26 -0700)

Trivial merge