John,

Pushed with some minor changes as 
85de88f1adcf5b91afe76bf671c05b8596821920:

- Removed copyright lines.
- Edited commit message a bit:
  - Wrapped to 72 characters, the git (or Linux?) convention
  - Shortened title as well: we often exceed the conventional 50 
  characters, but try to keep it short still
  - Wrote ‘{,-next-pgtk}’: valid variable names like 
  ‘foo-tools/static’ exist
  - Wrote ‘(var1, var2)’ instead of ‘(var1 and var2)’.

Thanks!

T G-R