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

[Michel Alexandre Salim]

commit c4824f4b7d1aff74472ad204969c56c1cd554ebd
Merge: c4a416b 14b04e5
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Nov 27 17:21:07 2010 +0100

    Merge branch 'master' into el6

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