Merge cbus
authorTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 21:32:18 +0000 (13:32 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 20 Jan 2010 21:32:18 +0000 (13:32 -0800)

Trivial merge