* ms/pcre-security:
  Fix CVE-2008-2371 (outer level option with alternatives caused crash).

OTP-8438  The re module: A regular expression with an option change at the
          start of a pattern that had top-level alternatives could cause
          overwriting and/or a crash. (Thanks to Michael Santos.)

* jn/supervisor_child_count_only:
  Add count_children/1 to supervisor.erl to determine the number of

OTP-8436  Added supervisor:count_children/1 to count the number of children
          being managed without the memory impact of which_children/1.
          (Thanks to Jay Nelson.)

The patch is from:
http://vcs.pcre.org/viewvc?revision=360&view=revision

Test case:
re:compile(<<"(?i)[\xc3\xa9\xc3\xbd]|[\xc3\xa9\xc3\xbdA]">>, [unicode]).

An option change at the start of a pattern that had top-level
alternatives could cause overwriting and/or a crash.

This potential security problem was recorded as CVE-2008-2371.

children being managed without the memory impact of which_children/1

The function which_children/1 returns a list of the child processes
currently being supervised, but it has the penalty of creating a new
list thereby consuming more memory.  In low memory situations it is
often desirable to know which supervisor may have generated many
processes, but the act of discovering the culprit should not cause the
node to crash (or worse a different node if the kernel kills one
randomly).  The new function count_children/1 can give an indication
of which supervisor is taxing resources the most without adding to the
burden.  Rather than creating a new list, it walks the supervisor's
internal children structure using an accumulator function so that any
used memory can be incrementally collected yet the resulting count can
still be obtained.

The return result of count_children/1 is a property list of counts
containing:
  - {specs, Total_Num_Child_Specs}
  - {active, Num_Active_Child_Processes_Of_Supervisor_Or_Worker_Type}
  - {supervisors, Num_Supervisor_Type_Children_Including_Dead_Processes}
  - {workers, Num_Worker_Type_Children_Including_Dead_Processes}

This patch was made in response to mailing list discussions of the
problem diagnosing heavily taxed production systems.  I cannot find
the original request, but http://www.erlang.org/cgi-bin/ezmlm-cgi/4/35060
is my original post of the patch.

          prompt strings (io:get_line/{1,2}). io_lib is also updated to
          format prompts with the 't' modifier (i.e. ~ts instead of ~s).

* ks/erl_lint:
  erl_lint_SUITE: adjust failing test case
  Allow recursive types and check for undefined types

OTP-8421: ks/erl_lint

Errors are now reported slightly differently, so we'll
need to adjust the test case.

          configuration parameter shell_prompt_func can be used for
          customizing the Erlang shell prompt.

Now, when we have only the constant definition of a macro (without
arguments), we always use it. In all other cases, we try to find the
exact matching definition. We throw an error if we don't find it.