Merge cbus
authorTony Lindgren <tony@atomide.com>
Thu, 13 May 2010 23:36:28 +0000 (16:36 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 13 May 2010 23:36:28 +0000 (16:36 -0700)

Trivial merge