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

[Michel Alexandre Salim]

commit f1aadca30650625596f6a27c92453366addfb3f6
Merge: 73e37ea 14b04e5
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Nov 12 14:19:37 2010 +0100

    Merge branch 'master' into f13

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