Merge cbus
authorTony Lindgren <tony@atomide.com>
Wed, 4 Nov 2009 21:03:42 +0000 (13:03 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Nov 2009 21:03:42 +0000 (13:03 -0800)
Merge branch 'cbus' into tmp-rebuild-1257368620


Trivial merge