Merge cbus
authorTony Lindgren <tony@atomide.com>
Tue, 6 Jul 2010 14:06:19 +0000 (17:06 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Jul 2010 14:06:19 +0000 (17:06 +0300)

Trivial merge