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

Conflicts:
	doc/blog/feature/streams2.md

diff --cc Makefile
Simple merge

diff --cc doc/api/timers.markdown
index 8395ac6779b76f0ba68d19c73b823bee07755ca4,2ec7e1c3ab6d905ab14ca634db7b89122c7b315f..7ba209e5ee9fab464c71013ddc218ba02f269983
--- 1/doc/api/timers.markdown
--- 2/doc/api/timers.markdown
+++ b/doc/api/timers.markdown
@@@ -51,14 -51,16 +51,14 @@@ request the timer hold the program open
  
  To schedule the "immediate" execution of `callback` after I/O events
  callbacks and before `setTimeout` and `setInterval` . Returns an
- `immediateId` for possible use with `clearImmediate()`. Optionally you
+ `immediateObject` for possible use with `clearImmediate()`. Optionally you
  can also pass arguments to the callback.
  
 -Immediates are queued in the order created, and are popped off the queue once
 -per loop iteration. This is different from `process.nextTick` which will
 -execute `process.maxTickDepth` queued callbacks per iteration. `setImmediate`
 -will yield to the event loop after firing a queued callback to make sure I/O is
 -not being starved. While order is preserved for execution, other I/O events may
 -fire between any two scheduled immediate callbacks.
 +Callbacks for immediates are queued in the order in which they were created.
 +The entire callback queue is processed every event loop iteration. If you queue
 +an immediate from a inside an executing callback that immediate won't fire
 +until the next event loop iteration.
  
- ## clearImmediate(immediateId)
+ ## clearImmediate(immediateObject)
  
  Stops an immediate from triggering.