# HG changeset patch # User Pat Downey # Date 1277308839 -3600 # Node ID 1aa3b69b573cc8bf35d031cfc44b9ceb860cad80 # Parent 759dc5235cdb6a20e9d4e2e91a8ce502891007ed# Parent 61b206842ac496c387fbbe1e77e3ff82c1340bbe Merge heads. diff -r 759dc5235cdb -r 1aa3b69b573c emailuis/nmailui/conf/nmeditorview.docml diff -r 759dc5235cdb -r 1aa3b69b573c emailuis/nmailui/conf/nmmessagelistview.docml diff -r 759dc5235cdb -r 1aa3b69b573c emailuis/nmhswidget/conf/nmhswidgetmail.docml diff -r 759dc5235cdb -r 1aa3b69b573c emailuis/nmhswidget/conf/nmhswidgettitle.docml