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

[Michel Alexandre Salim]

commit d0bcd0f0b3a95babaf8f8857e63bb024ba6adc43
Merge: c4824f4 5b8b2db
Author: Michel Alexandre Salim <michel at sojourner.localdomain>
Date:   Mon Aug 1 02:30:34 2011 +0200

    Merge branch 'master' into el6

 .gitignore            |    1 +
 emacs-common-w3m.spec |   23 +++++++++++++++--------
 sources               |    2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)
---