Merge cbus
authorTony Lindgren <tony@atomide.com>
Mon, 5 Jul 2010 14:05:14 +0000 (17:05 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 5 Jul 2010 14:05:14 +0000 (17:05 +0300)

Trivial merge