Merge cbus
authorTony Lindgren <tony@atomide.com>
Tue, 19 Oct 2010 22:17:24 +0000 (15:17 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 19 Oct 2010 22:17:24 +0000 (15:17 -0700)

Trivial merge