--- summary 
+++ summary 
@@ -1,19 +1,19 @@
 Test Suite: ERP5-MASTER
-Revision: slapos=3636-1253813af4f89b3dcf62ea96c123d69284649a22,erp5=41795-1f541a2d48ce185ff20f43d870ce89abe2cb72f8
+Revision: slapos=3636-1253813af4f89b3dcf62ea96c123d69284649a22,erp5=41796-0389e5f5df3aa478fd3fd90237376f0528ae08b3
 Result: FAIL
 
 All tests: 3506
-Failures: 1
-Errors: 1
+Failures: 2
+Errors: 0
 Skips: 196
 
- http://erp5.nexedi.com/test_result_module/20121218-2A12A2D3/view
+ http://erp5.nexedi.com/test_result_module/20121219-B73A6B3/view
 
 
 The following tests failed:
 
-  testConflictResolution                             (1 errors)
-   testActiveProcess (testConflictResolution.TestERP5)
+  testIngestionWithFlare                             (1 failures, 4 skips)
+   test_05_FormatIngestionPresentation (testIngestionWithFlare.TestIngestionWithFlare)
 
   testOOoDynamicStyle                                (1 failures)
    test_include_img (testOOoDynamicStyle.TestOooDynamicStyle)