Merge branch 'master' into feature/collection-concurrent

Conflicts:
	src/library/scala/collection/JavaConversions.scala
	src/library/scala/collection/JavaConverters.scala

Add one test for concurrent map conversion.

1 files changed, 37 insertions, 0 deletions

diff --git a/test/scaladoc/resources/code-indent.scala b/test/scaladoc/resources/code-indent.scala
new file mode 100644
index 0000000000..88946ffc7f
--- /dev/null
+++ b/test/scaladoc/resources/code-indent.scala
@@ -0,0 +1,37 @@
+/** 
+ * This is an example of indented comments:
+ *    {{{
+ *       a typicial indented 
+ *       comment on multiple
+ *       comment lines
+ *    }}}
+ *    {{{ one liner }}}
+ *    {{{ two lines, one useful
+ *    }}}
+ *    {{{
+ *       line1
+ *       line2
+ *       line3
+ *       line4}}}
+ *    {{{
+ *       a ragged example
+ *       a (condition)
+ *         the t h e n branch
+ *       an alternative
+ *         the e l s e branch
+ *    }}}
+ *    NB: Trailing spaces are necessary for this test!
+ *    {{{
+ *       l1
+ *
+ *       l2
+ * 
+ *       l3
+ *    
+ *       l4
+ *         
+ *       l5
+ *    }}}
+
+ */
+class C