Merge remote-tracking branch '14427/incoming'

Conflicts:
	src/libstd/sort.rs

Author: brson

src/cargo/cargo.rs

@@ -1491,7 +1491,7 @@ fn print_pkg(s: @Source, p: &Package) {
 fn print_source(s: @Source) {
     info(s.name + ~" (" + s.url + ~")");
 
-    let pks = sort::merge_sort(sys::shape_lt, s.packages.get());
+    let pks = sort::merge_sort(s.packages.get(), sys::shape_lt);
     let l = vec::len(pks);
 
     print(io::with_str_writer(|writer| {