# HG changeset patch
# User Peter B. Kessler <Peter.B.Kessler@Oracle.COM>
# Date 1363211708 25200
# Node ID 9d2e83b4ebbfd4316b2d9a67ced4a65420e74d46
# Parent  5bed444f0f5c2be5866ce08cda0ddebe7da2e3b6# Parent  2237260c6fdb8c8b76e5397991a854bea6120d12
Merge.

diff -r 2237260c6fdb -r 9d2e83b4ebbf graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java
--- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java	Wed Mar 13 21:55:08 2013 +0100
+++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java	Wed Mar 13 14:55:08 2013 -0700
@@ -38,7 +38,7 @@
  * should be speculated on. When the speculation fails and the child node cannot return the
  * appropriate type of value, it can use an {@link UnexpectedResultException} to still pass the
  * result to the caller. In such a case, the caller must rewrite itself to a more general version in
- * oder to avoid future failures of this kind.
+ * order to avoid future failures of this kind.
  * </p>
  */
 public class ReturnTypeSpecializationTest {