Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Fri, 12 Feb 2010 23:00:44 +0000 (15:00 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 12 Feb 2010 23:00:44 +0000 (15:00 -0800)

Trivial merge