trunk

[Alfredo Braunstein]

I wonder the reason for this kind of changes on trunk. It certainly makes
compilation a bit difficult... ;-)

+<<<<<<< .mine
+#include "BufferParams.h"
+=======
 #include "Counters.h"
+>>>>>>> .r19497

A/