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)
commit23737e3dd01ef6ac0ae9134300a4c66807ae00d2
treef1d3e0dac0c649dbe529e02a2ec3967a0d362d47
parent84e368f680c20efaabd1468c9d66eb13b2c62350
parentba564f2164f381af846d9695e6465cffe7ec918c
Merge branch 'upstream' into stable

Conflicts:
ChangeLog
NEWS
lib/spawn.in.h