Merge cbus
authorTony Lindgren <tony@atomide.com>
Wed, 9 Dec 2009 01:47:27 +0000 (17:47 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 9 Dec 2009 01:47:27 +0000 (17:47 -0800)
Merge branch 'cbus' into tmp-rebuild-1260323192


Trivial merge