[mozplugger/f13/master: 6/6] Merge branch 'master' into f13

[Than Ngo]

commit ef936aca186199b80ddcad655c06deb548505af6
Merge: ff8af82 dabb847
Author: Than Ngo <than at redhat.com>
Date:   Wed Sep 29 12:38:00 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	mozplugger.spec
    	sources

 .gitignore      |    2 ++
 mozplugger.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index df37b9e,e9db423..ee36f5d
--- a/.gitignore
+++ b/.gitignore
@@@ -4,4 -4,5 +4,6 @@@ mozplugger-1.7.1.tar.g
  mozplugger-1.7.3.tar.gz
  mozplugger-1.10.1.tar.gz
  mozplugger-1.12.1.tar.gz
 +mozplugger-1.13.3.tar.gz
+ mozplugger-1.14.1.tar.gz
 -/mozplugger-1.14.2.tar.gz
++mozplugger-1.14.2.tar.gz