Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 21:13:12 +0000 (16:13 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 21:13:12 +0000 (16:13 -0500)
commit5a876cd5f810b611f78dd4cf7a1673bffeea19a9
tree93d7479d8263fb828f95932a0cb3e3b0678fa996
parentb3108ead2d1691d8ad3005a6350c4febf92df2fb
parentabd5cfe880473c8da925d5b83e52c8019803d87d
Merge from mainline.