Fix output reordering when you get a conflict on an update....

gclient_utils.py

Index: gclient_utils.py
===================================================================
--- gclient_utils.py	(revision 31140)
+++ gclient_utils.py	(working copy)
@@ -209,7 +209,8 @@
   # executable, but shell=True makes subprocess on Linux fail when it's called
   # with a list because it only tries to execute the first item in the list.
   kid = subprocess.Popen(command, bufsize=0, cwd=in_directory,
-      shell=(sys.platform == 'win32'), stdout=subprocess.PIPE)
+      shell=(sys.platform == 'win32'), stdout=subprocess.PIPE, 
+      stderr=subprocess.STDOUT)
 
   # Also, we need to forward stdout to prevent weird re-ordering of output.
   # This has to be done on a per byte basis to make sure it is not buffered: