Merge remote-tracking branch 'erickt/master'

Conflicts:
	src/libcore/vec.rs
	src/libstd/getopts.rs

2 files changed, 3 insertions, 2 deletions

diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs
index bc96cb65efa..48d83f0e5c2 100644
--- a/src/libstd/getopts.rs
+++ b/src/libstd/getopts.rs
@@ -149,7 +149,7 @@ fn name_str(nm: name) -> str {
 }
 
 fn find_opt(opts: [opt], nm: name) -> option<uint> {
-    vec::position_pred(opts, { |opt| opt.name == nm })
+    vec::position(opts, { |opt| opt.name == nm })
 }
 
 /*
diff --git a/src/libstd/map.rs b/src/libstd/map.rs
index 3f53270ed10..8da3d78552d 100644
--- a/src/libstd/map.rs
+++ b/src/libstd/map.rs
@@ -95,6 +95,7 @@ iface map<K: copy, V: copy> {
     Iterate over all the keys in the map
     */
     fn keys(fn(K));
+
     /*
     Iterate over all the values in the map
     */
@@ -631,4 +632,4 @@ mod tests {
         map.insert(key, "val");
         assert (option::get(map.find(key)) == "val");
     }
-}
\ No newline at end of file
+}