Merge remote-tracking branch 'original/incoming' into incoming

diff --cc src/cargo/cargo.rs
Simple merge

diff --cc src/libstd/sort.rs
index 98f98fe7fce6fd30004c772f25dd8f2dc60f8933,0b00da9f81d7bca9cda13ffc9e6bae7a013565df..946a3e1155dd520ce67eb9c5b4912105454ef12d
--- 1/src/libstd/sort.rs
--- 2/src/libstd/sort.rs
+++ b/src/libstd/sort.rs
@@@ -897,9 -248,9 +897,9 @@@ mod test_qsort 
  
          let expected = ~[1, 2, 3];
  
 -        sort::quick_sort(|x, y| { int::le(*x, *y) }, names);
 +        do sort::quick_sort(names) |x, y| { int::le(*x, *y) };
  
-         let immut_names = vec::from_mut(names);
+         let immut_names = vec::from_mut(move names);
  
          let pairs = vec::zip(expected, immut_names);
          for vec::each(pairs) |p| {

diff --cc src/libstd/test.rs
Simple merge

diff --cc src/libsyntax/attr.rs
Simple merge

diff --cc src/libsyntax/ext/qquote.rs
Simple merge

diff --cc src/rustc/metadata/cstore.rs
Simple merge

diff --cc src/rustc/metadata/encoder.rs
Simple merge

diff --cc src/rustdoc/sort_pass.rs
Simple merge

diff --cc src/test/bench/shootout-k-nucleotide-pipes.rs
Simple merge