Merge from mainline.
commit6bfc48ac4901be1c53471d1254e71091010ddd73
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 01:57:53 +0000 (27 17:57 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 01:57:53 +0000 (27 17:57 -0800)
tree229eec30e391cedafbad4fbbd1f0d6be4ae48e23
parentc8b6c1e09aa69dc2a3de492af582694d518884a3
parent10dff68f1daada141f23bdf647fbc2cb2eb51fc8
Merge from mainline.