Merge cbus
authorTony Lindgren <tony@atomide.com>
Fri, 30 Oct 2009 23:32:06 +0000 (16:32 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 30 Oct 2009 23:32:06 +0000 (16:32 -0700)
Merge branch 'cbus' into tmp-rebuild-1256945522


Trivial merge