Merge commit 'origin/stable' into stable
authorBen Pfaff <blp@gnu.org>
Tue, 15 Sep 2009 03:41:35 +0000 (20:41 -0700)
committerBen Pfaff <blp@gnu.org>
Tue, 15 Sep 2009 03:41:35 +0000 (20:41 -0700)

Trivial merge