Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Sun, 18 Apr 2010 00:45:43 +0000 (01:45 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 18 Apr 2010 00:45:43 +0000 (01:45 +0100)
Conflicts:
ChangeLog
NEWS
lib/spawn.in.h


Trivial merge