Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 23:13:03 +0000 (16:13 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 23:13:03 +0000 (16:13 -0700)

Trivial merge