Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 16:48:33 +0000 (09:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 16:48:33 +0000 (09:48 -0700)
commit8462fc0ce20cc1caf883996d193d1cd2c1629498
tree24128a3269ef5f6c79086a2387510d71f060d0f8
parentfa23e171f4d9390c1c4151355ec72f9ff6fc90ab
parenta9041e6caf73abe867602bc60f2f3d48601a908d
Merge from trunk.