svn merge -c 34292 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 34302 https://dart.googlecode.com/svn/branches/bleeding_edge trunk

git-svn-id: http://dart.googlecode.com/svn/trunk@34308 260f80e4-7a28-3924-810f-c04153c831b5