Merge branch 'devel-dt' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 12:00:19 +0000 (05:00 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 12:00:19 +0000 (05:00 -0700)

Trivial merge