[emacs-common-w3m/f14/master: 4/4] Merge branch 'master' into f14

[Michel Alexandre Salim]

commit 7d8eea13403925867973575f4d57194c8d289eff
Merge: ce1a2ed 14b04e5
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Nov 12 14:10:12 2010 +0100

    Merge branch 'master' into f14

 emacs-common-w3m.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---