Merge branch 'dt' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 29 Feb 2012 00:44:50 +0000 (16:44 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Feb 2012 00:44:50 +0000 (16:44 -0800)

Trivial merge