Merge branch 'cbus'
authorTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 21:37:36 +0000 (14:37 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 30 Sep 2009 21:37:36 +0000 (14:37 -0700)

Trivial merge