Merge branch 'siri/string-new-api'

* siri/string-new-api: (28 commits)
  hipe (test): Do not use deprecated functions in string(3)
  dialyzer (test): Do not use deprecated functions in string(3)
  eunit (test): Do not use deprecated functions in string(3)
  system (test): Do not use deprecated functions in string(3)
  system (test): Do not use deprecated functions in string(3)
  mnesia (test): Do not use deprecated functions in string(3)
  Deprecate old string functions
  observer: Do not use deprecated functions in string(3)
  common_test: Do not use deprecated functions in string(3)
  eldap: Do not use deprecated functions in string(3)
  et: Do not use deprecated functions in string(3)
  os_mon: Do not use deprecated functions in string(3)
  debugger: Do not use deprecated functions in string(3)
  runtime_tools: Do not use deprecated functions in string(3)
  asn1: Do not use deprecated functions in string(3)
  compiler: Do not use deprecated functions in string(3)
  sasl: Do not use deprecated functions in string(3)
  reltool: Do not use deprecated functions in string(3)
  kernel: Do not use deprecated functions in string(3)
  hipe: Do not use deprecated functions in string(3)
  ...

Conflicts:
	lib/eunit/src/eunit_lib.erl
	lib/observer/src/crashdump_viewer.erl
	lib/reltool/src/reltool_target.erl

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/os_mon/src/cpu_sup.erl b/lib/os_mon/src/cpu_sup.erl
index e758b63d19..c1c972b5b1 100644
--- a/lib/os_mon/src/cpu_sup.erl
+++ b/lib/os_mon/src/cpu_sup.erl
@@ -244,7 +244,7 @@ get_uint32_measurement(Request, #internal{os_type = {unix, Sys}}) when Sys == ir
     %% Get the load average using uptime.
     %% "8:01pm  up 2 days, 22:12,  4 users,  load average: 0.70, 0.58, 0.43"
     D = os:cmd("uptime") -- "\n",
-    Avg = lists:reverse(hd(string:tokens(lists:reverse(D), ":"))),
+    Avg = lists:reverse(hd(string:lexemes(lists:reverse(D), ":"))),
     {ok, [L1, L5, L15], _} = io_lib:fread("~f, ~f, ~f", Avg),
     case Request of
 	?avg1  -> sunify(L1);