[pitivi/f13/master: 9/9] Merge branch 'master' into f13

[Chen Lei]

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

    Merge branch 'master' into f13

 .gitignore  |    2 +-
 pitivi.spec |  156 +++++++++++++++-------------------------------------------
 sources     |    2 +-
 3 files changed, 43 insertions(+), 117 deletions(-)
---