Merge cbus
authorTony Lindgren <tony@atomide.com>
Sat, 14 Nov 2009 01:55:29 +0000 (17:55 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 14 Nov 2009 01:55:29 +0000 (17:55 -0800)
Merge branch 'cbus' into tmp-rebuild-1258163727


Trivial merge