[viewmtn/el6/master: 5/5] Merge branch 'master' into el6

[Thomas Moschny]

commit 7274aafb920183b25b0b0c6782f9e5aa5b991195
Merge: 534e67a 7c9efef
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Aug 6 10:41:28 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore   |    1 +
 sources      |    2 +-
 viewmtn.spec |  123 ++++++++++++++++++++++++++++++++++-----------------------
 3 files changed, 75 insertions(+), 51 deletions(-)
---