Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Tue, 27 Apr 2010 01:30:00 +0000 (18:30 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 27 Apr 2010 01:30:00 +0000 (18:30 -0700)

Trivial merge