[mkvtoolnix/f14/master: 15/15] Merge branch 'master' into f14

[Dominik Mierzejewski]

commit fb2082918a3e83d6349f1661919cf84dc92de05d
Merge: bf70455 ab294e2
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Sat Nov 20 23:30:38 2010 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	mkvtoolnix.spec
    	sources

 .gitignore      |    2 +-
 mkvtoolnix.spec |   14 ++++++++++----
 sources         |    2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index a212046,e21ff1c..e2ef4dd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--mkvtoolnix-4.2.0.tar.bz2
 -/mkvtoolnix-4.4.0.tar.bz2
++mkvtoolnix-4.4.0.tar.bz2