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

Trivial merge