Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Tue, 18 May 2010 23:23:13 +0000 (16:23 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 18 May 2010 23:23:13 +0000 (16:23 -0700)

Trivial merge