Merge branch 'video' of git://sflphone.org/git/sflphone into video

Conflicts:

	src/memmanager/MemManager.h

src/memmanager/MemManager.h

@@ -9,7 +9,7 @@
 #include "MemSorter.h"
 #include "MemData.h"
 #include "MemSpace.h"
-#include "MemKey.h"
+#include "MemKey.h"
 
 using namespace std;