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

Conflicts:

	pyfpdb/Hud.py

Hope I chose the right lines here.

pyfpdb/Hud.py

@@ -55,6 +55,7 @@ class Hud:
         self.db_name       = db_name
         self.deleted       = False
         self.stacked       = True
+        self.site          = table.site
         self.colors = config.get_default_colors(self.table.site)
 
         self.stat_windows = {}
@@ -228,7 +229,8 @@ class Hud:
             aux_params = config.get_aux_parameters(game_params['aux'])
             self.aux_windows.append(eval("%s.%s(gtk.Window(), config, 'fpdb')" % (aux_params['module'], aux_params['class'])))
         
-        gobject.timeout_add(500, self.update_table_position)
+        gobject.timeout_add(0.5, self.update_table_position)
+
             
     def update(self, hand, config, stat_dict):
         self.hand = hand   # this is the last hand, so it is available later