Merge from mainline.
commitcf206f28eb11467aed7f5e03f3e4df7724fd98d2
authorEli Zaretskii <eliz@gnu.org>
Fri, 22 Jan 2010 20:40:56 +0000 (22 15:40 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 22 Jan 2010 20:40:56 +0000 (22 15:40 -0500)
tree2f5695e6a774a918874b82c286f140abd052d860
parent5a876cd5f810b611f78dd4cf7a1673bffeea19a9
parentc893016b07f33eb8d56e1011245fe59a67cb4ee0
Merge from mainline.