Merge branch 'devel-dt' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 10 Jul 2012 07:34:24 +0000 (00:34 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 10 Jul 2012 07:34:24 +0000 (00:34 -0700)

Trivial merge