Merge cbus
authorTony Lindgren <tony@atomide.com>
Wed, 7 Jul 2010 12:39:58 +0000 (15:39 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Jul 2010 12:39:58 +0000 (15:39 +0300)

Trivial merge