Fixed wrong merge conflict resolution
Fixed wrong merge conflict resolution

flumotion-mirror/flumotion,timvideos/flumotion,Flumotion/flumotion,timvideos/flumotion,Flumotion/flumotion,timvideos/flumotion,flumotion-mirror/flumotion,Flumotion/flumotion,Flumotion/flumotion