Merge remote-tracking branch 'upstream/v0.10'

diff --cc doc/api/child_process.markdown
Simple merge

diff --cc lib/events.js
index 770ba12,781748b..b1d5c51
--- 1/lib/events.js
--- 2/lib/events.js
+++ b/lib/events.js
@@@ -268,9 -261,9 +268,9 @@@ EventEmitter.prototype.removeAllListene
  
    listeners = this._events[type];
  
 -  if (typeof listeners === 'function') {
 +  if (util.isFunction(listeners)) {
      this.removeListener(type, listeners);
-   } else {
+   } else if (Array.isArray(listeners)) {
      // LIFO order
      while (listeners.length)
        this.removeListener(type, listeners[listeners.length - 1]);