Merge branch 'master' of git://git.assembla.com/free_poker_tools

Conflicts:

	pyfpdb/Hud.py

pyfpdb/fpdb_import.py

@@ -138,7 +138,7 @@ class Importer:
 		# ^^ May not work on windows
 		for dir in self.dirlist:
 			for file in os.listdir(dir):
-				self.filelist = self.filelist + [dir+os.sep+file]
+				self.filelist = self.filelist + [os.path.join(dir, file)]
 
 		self.filelist = list(set(self.filelist))