Merge fixes for the editor in trunk (now 0.4.7+5)

Fixes for: dartbug.com/9705 and dartbug.com/9977

svn merge -c 21648 https://dart.googlecode.com/svn/branches/bleeding_edge .
svn merge -c 21651 https://dart.googlecode.com/svn/branches/bleeding_edge .

git-svn-id: http://dart.googlecode.com/svn/trunk@21658 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/tools/VERSION b/tools/VERSION
index eecf41e..9d1e241 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -1,4 +1,4 @@
 MAJOR 0
 MINOR 4
 BUILD 7
-PATCH 4
+PATCH 5