Merge commit from develop

IMFFormData.h

@@ -1,7 +1,7 @@
 #ifndef __IMFFormData_h__
-#define __IMFFormData_h__
+# define __IMFFormData_h__
 
-#include "IMFMultipart.h"
+# include "IMFMultipart.h"
 
 namespace coreutils {
 
@@ -9,9 +9,9 @@ namespace coreutils {
 
     public:
       IMFFormData();
-      IMFFormData(PString *in, std::string boundary);
+      IMFFormData(ZString &in, ZString &boundary);
 
-		std::string getByName(std::string name);
+      ZString getByName(ZString &name);
 
    };