Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Fri, 23 Nov 2012 18:13:53 +0000 (20:13 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 23 Nov 2012 18:13:53 +0000 (20:13 +0200)
commit3f8879751b8dc5e007dd8e8acdea7c7e605a2612
treeca1408d5863bb7cdcbd4869d141dbe7a7cb6f7b3
parenta414bed56d8fed3e1c55341025d707b139c2ce41
parent277c8f21a139fb6727fad7fc856f31eaf183fd1e
Merge from trunk.