Merge commit 'v0.6.2' into stable fc11-i386-build87 fc11-x64-build84 lenny-x64-build102 sid-i386-build154
authorBen Pfaff <blp@gnu.org>
Tue, 2 Feb 2010 04:25:45 +0000 (20:25 -0800)
committerBen Pfaff <blp@gnu.org>
Tue, 2 Feb 2010 04:25:45 +0000 (20:25 -0800)

Trivial merge