Merge cbus
authorTony Lindgren <tony@atomide.com>
Tue, 15 Dec 2009 21:51:33 +0000 (13:51 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 15 Dec 2009 21:51:33 +0000 (13:51 -0800)
Merge branch 'cbus' into tmp-rebuild-1260913890


Trivial merge