Merge branch 'master' into roland/bug-compat
authorRoland McGrath <roland@redhat.com>
Fri, 19 Dec 2008 09:21:42 +0000 (01:21 -0800)
committerRoland McGrath <roland@redhat.com>
Fri, 19 Dec 2008 09:21:42 +0000 (01:21 -0800)
commite9325441414f856dff154b607912a519fe696eff
treec8c2c45f688412d04b6cfb20c27f2e66aed34045
parent468b3739cde6cb3a8727eb8eff8cd2686e734e77
parentd151240ed43bc3e281d85b867617acbd3b9ac53e
Merge branch 'master' into roland/bug-compat