Merge cbus into master
authorTony Lindgren <tony@atomide.com>
Tue, 6 Oct 2009 02:06:35 +0000 (19:06 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Oct 2009 02:06:35 +0000 (19:06 -0700)
Merge branch 'cbus'


Trivial merge