auto merge of #4858 : z0w0/rust/rm_weak_task_count, r=graydon

diff --cc src/libcore/private/weak_task.rs
Simple merge

diff --cc src/rt/rust_builtin.cpp
Simple merge

diff --cc src/rt/rustrt.def.in
Simple merge