commit 4a9313e72a19202f55efa07e41b7cc770e29b909 Merge: ff3631c dabb847 Author: Than Ngo <than at redhat.com> Date: Wed Sep 29 12:27:32 2010 +0200 Merge branch 'master' into f14 Conflicts: mozplugger.spec sources .gitignore | 2 ++ mozplugger.spec | 5 ++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) ---