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)
* origin/master:
  prefer later defined commands (fixes #3858)


Trivial merge