Merge cbus
authorTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 15:33:03 +0000 (18:33 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 15:33:03 +0000 (18:33 +0300)

Trivial merge