Merge cbus
authorTony Lindgren <tony@atomide.com>
Tue, 29 Dec 2009 00:57:08 +0000 (16:57 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 29 Dec 2009 00:57:08 +0000 (16:57 -0800)
Merge branch 'cbus' into tmp-rebuild-1262048216


Trivial merge