Merge cbus
authorTony Lindgren <tony@atomide.com>
Sat, 12 Dec 2009 21:45:40 +0000 (13:45 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 12 Dec 2009 21:45:40 +0000 (13:45 -0800)
Merge branch 'cbus' into tmp-rebuild-1260654336


Trivial merge