[pitivi/f12/master: 13/13] Merge branch 'master' into f12

[Chen Lei]

commit dd95bbdf6c562582a618abf78b759ff5a4d733fe
Merge: f300ed8 4d6c36b
Author: Chen Lei <supercyper at 163.com>
Date:   Thu Sep 23 14:08:01 2010 +0800

    Merge branch 'master' into f12

 .gitignore  |    2 +-
 pitivi.spec |  177 +++++++++++++++++++++++------------------------------------
 sources     |    2 +-
 3 files changed, 70 insertions(+), 111 deletions(-)
---