Merge branch 'fixes-dt' into fixes

This commit is contained in:
Tony Lindgren 2012-02-07 20:57:41 -08:00
commit 2416dc8510