Merge branch 'ticket-38' of ssh://deep-ras.srv.lrz.de/git/dcdb into ticket-38

Conflicts:
	FilePusher/Makefile

DCDBTools/dcdbcsvimport/dcdbcsvimport.cpp

@@ -126,7 +126,7 @@ int main(int argc, char** argv)
   while (std::getline(fs, s)) {
     int col = 0;
     lineno++;
-	DCDB::TimeStamp ts(0ull);
+	DCDB::TimeStamp ts(UINT64_C(0));
 	boost::tokenizer<boost::escaped_list_separator<char> > tk(s, boost::escaped_list_separator<char>('\\', ',', '\"'));
     for (boost::tokenizer<boost::escaped_list_separator<char> >::iterator i=tk.begin(); i!=tk.end();++i) 
     {