Merge branch 'devel-l2x0'
authorTony Lindgren <tony@atomide.com>
Sat, 18 Dec 2010 17:36:07 +0000 (09:36 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 18 Dec 2010 17:36:07 +0000 (09:36 -0800)

Trivial merge