Merge branch 'devel-dt'
authorTony Lindgren <tony@atomide.com>
Fri, 24 Aug 2012 20:24:01 +0000 (13:24 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Aug 2012 20:24:01 +0000 (13:24 -0700)

Trivial merge