Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Tue, 4 May 2010 01:22:19 +0000 (18:22 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 4 May 2010 01:22:19 +0000 (18:22 -0700)

Trivial merge