Merge cbus
authorTony Lindgren <tony@atomide.com>
Fri, 2 Jul 2010 10:39:13 +0000 (13:39 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 2 Jul 2010 10:39:13 +0000 (13:39 +0300)

Trivial merge