[pitivi/f15: 10/10] Merge branch 'f16' into f15

[Jon Ciesla]

commit ae3363e77c3ab652e4111dcec51fa4e52e8f8f68
Merge: bc1e89d 80c12df
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Mar 27 12:23:20 2012 -0500

    Merge branch 'f16' into f15
    
    Conflicts:
    	pitivi.spec

 pitivi-0.15.0-ignore-unknown-stream-types.patch |   29 +++++++++++++++++++++++
 pitivi.spec                                     |   11 ++++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---