Merge branch 'develop' into tables

* develop:
  the original change broke a few tests.  I think this one is better
diff --git a/textLayout/src/flashx/textLayout/container/TextContainerManager.as b/textLayout/src/flashx/textLayout/container/TextContainerManager.as
index 04d8366..a89566a 100644
--- a/textLayout/src/flashx/textLayout/container/TextContainerManager.as
+++ b/textLayout/src/flashx/textLayout/container/TextContainerManager.as
@@ -578,7 +578,7 @@
 					hadPreviousSelection = true;
 					
 					//preserve the selection state [bug #2931406 from Flex SDK]
-					if (_preserveSelectionOnSetText && text)
+					if (_preserveSelectionOnSetText && text != null)
                     {
                         oldAnchorPosition = Math.min(_textFlow.interactionManager.anchorPosition, text.length);
                         oldActivePosition = Math.min(_textFlow.interactionManager.activePosition, text.length);