Merge remote-tracking branch 'origin/master' into newcg
authorSimon Marlow <marlowsd@gmail.com>
Thu, 5 Jul 2012 12:38:32 +0000 (13:38 +0100)
committerSimon Marlow <marlowsd@gmail.com>
Thu, 5 Jul 2012 12:38:32 +0000 (13:38 +0100)
commit314ea4ffff1aef6f6dac7a6f7d3d293122508bf0
tree6d2ebe7b88d3954e4018e4858e42c09325db9620
parentbfbdbcb9c4fc7608c6eb6d3d1c645bfb501ecf0a
parentad16de235c7ea9a9be65c77c576dd548251ddb16
Merge remote-tracking branch 'origin/master' into newcg

* origin/master:
  prefer later defined commands (fixes #3858)