Merge main.

diff --cc source/config/__init__.py
Simple merge

diff --cc source/gui/settingsDialogs.py
index 47cbecc,ccd1b80..b2ec25a
--- 1/source/gui/settingsDialogs.py
--- 2/source/gui/settingsDialogs.py
+++ b/source/gui/settingsDialogs.py
@@@ -775,9 -797,9 +803,10 @@@ class DocumentFormattingDialog(Settings
                config.conf["documentFormatting"]["reportSpellingErrors"]=self.spellingErrorsCheckBox.IsChecked()\r
                config.conf["documentFormatting"]["reportPage"]=self.pageCheckBox.IsChecked()\r
                config.conf["documentFormatting"]["reportLineNumber"]=self.lineNumberCheckBox.IsChecked()\r
 +              config.conf["documentFormatting"]["reportLineIndentation"]=self.lineIndentationCheckBox.IsChecked()\r
                config.conf["documentFormatting"]["reportTables"]=self.tablesCheckBox.IsChecked()\r
                config.conf["documentFormatting"]["reportTableHeaders"]=self.tableHeadersCheckBox.IsChecked()\r
+               config.conf["documentFormatting"]["reportTableCellCoords"]=self.tableCellCoordsCheckBox.IsChecked() \r
                config.conf["documentFormatting"]["reportLinks"]=self.linksCheckBox.IsChecked()\r
                config.conf["documentFormatting"]["reportHeadings"]=self.headingsCheckBox.IsChecked()\r
                config.conf["documentFormatting"]["reportLists"]=self.listsCheckBox.IsChecked()\r

diff --cc source/speech.py
index e87969a,a565d3c..6802844
--- 1/source/speech.py
--- 2/source/speech.py
+++ b/source/speech.py
@@@ -651,18 -638,7 +669,18 @@@ def speakTextInfo(info,useCache=True,fo
                                relativeTextList.append(text)\r
                                lastTextOkToMerge=False\r
  \r
-       text=" ".join(relativeTextList)\r
+       text=CHUNK_SEPARATOR.join(relativeTextList)\r
 +      if unit == textInfos.UNIT_LINE and formatConfig["reportLineIndentation"]:\r
 +              (lineIndentation, text) = calculateTextIndentation(text)\r
 +              oldLineIndentation = getattr(info.obj,'_speakTextInfo_lineIndentationCache', None)\r
 +              if not oldLineIndentation:\r
 +                      # Assume no indent by default.\r
 +                      oldLineIndentation = calculateTextIndentation("")[0]\r
 +              if lineIndentation != oldLineIndentation:\r
 +                      textList.append(lineIndentation)\r
 +                      info.obj._speakTextInfo_lineIndentationCache = lineIndentation\r
 +                      textListBlankLen += 1 # need to add one so that we continue to say blank for blank lines.\r
 +\r
        # Don't add this text if it is blank.\r
        if text and not isBlank(text):\r
                textList.append(text)\r

diff --cc user_docs/en/changes.t2t
index 118a8e2,6c28cba..9879eaa
--- 1/user_docs/en/changes.t2t
--- 2/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@@ -3,7 -3,23 +3,24 @@@
  \r
  %!includeconf: ../changes.t2tconf\r
  \r
+ = 2011.3 =\r
+ \r
+ == New Features ==\r
+ - In Mozilla Gecko (e.g. Firefox) Heading levels are now announced  when using object navigation.\r
+ - Text formatting can now be reported when using browse mode in Mozilla Gecko (e.g. Firefox and Thunderbird). (#394)\r
+ - Text with underline and/or strikethrough can now be detected and reported in standard IAccessible2 text controls such as in Mozilla applications.\r
+ - NVDA will now restart itself if it crashes.\r
++- By selecting report line indentation in the document formatting dialogue, NVDA will announce the number of leading tabs and spaces of the current line in the order that they are entered. (#373)\r
+ \r
+ \r
+ == Bug Fixes ==\r
+ - NVDA  no longer shows bullets or numbering for lists in Internet Explorer and other MSHTML controls when the author has indicated that these should not be shown (i.e. the list style is "none"). (#1671)\r
+ - Restarting NVDA when it has frozen (e.g. by pressing control+alt+n) no longer exits the previous copy without starting a new one.\r
+ - Pressing backspace or arrow keys in a Windows command console no longer causes strange results in some cases. (#1612)\r
+ \r
+ \r
  = 2011.2 =\r
+ Highlights of this release include major improvements concerning punctuation and symbols, including configurable levels, custom labelling and character descriptions; no pauses at the end of lines during say all; improved support for ARIA in Internet Explorer; better support for XFA/LiveCycle PDF documents in Adobe Reader; access to text written to the screen in more applications; and access to formatting and color information for text written to the screen.\r
  \r
  == New Features ==\r
  - It is now possible to hear the description for any given character by pressing the review current character script twice in quick succession.  For English characters this is the standard English phonetic alphabet. For pictagraphic languages such as traditional Chinese, one or more example phraises using the given symbol are provided. Also pressing review current word or review current line three times will spell the word/line using the first of these descriptions. (#55)\r