Merge cbus
authorTony Lindgren <tony@atomide.com>
Thu, 14 Jan 2010 02:10:56 +0000 (18:10 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 14 Jan 2010 02:10:56 +0000 (18:10 -0800)

Trivial merge