Merge branch 'incoming' into snap-2012-10-05

src/test/compile-fail/cap-clause-use-after-move.rs

@@ -1,7 +1,5 @@
-// error-pattern:Unsatisfied precondition constraint
-
 fn main() {
     let x = 5;
     let _y = fn~(move x) { };
-    let _z = x; //< error: Unsatisfied precondition constraint
+    let _z = x; //~ ERROR use of moved variable: `x`
 }