Merge cbus
authorTony Lindgren <tony@atomide.com>
Wed, 11 Nov 2009 02:30:55 +0000 (18:30 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 11 Nov 2009 02:30:55 +0000 (18:30 -0800)
Merge branch 'cbus' into tmp-rebuild-1257906651


Trivial merge