Merge cbus
authorTony Lindgren <tony@atomide.com>
Fri, 18 Dec 2009 02:51:45 +0000 (18:51 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Dec 2009 02:51:45 +0000 (18:51 -0800)
Merge branch 'cbus' into tmp-rebuild-1261104699


Trivial merge