Merge cbus
authorTony Lindgren <tony@atomide.com>
Thu, 12 Nov 2009 02:50:33 +0000 (18:50 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 12 Nov 2009 02:50:33 +0000 (18:50 -0800)
Merge branch 'cbus' into tmp-rebuild-1257994230


Trivial merge