Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Thu, 11 Mar 2010 03:23:44 +0000 (19:23 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 11 Mar 2010 03:23:44 +0000 (19:23 -0800)

Trivial merge