Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Wed, 31 Mar 2010 12:04:30 +0000 (05:04 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 31 Mar 2010 12:04:30 +0000 (05:04 -0700)

Trivial merge