Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Mon, 22 Feb 2010 23:29:02 +0000 (15:29 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 22 Feb 2010 23:29:02 +0000 (15:29 -0800)

Trivial merge