sync from stable branch

docs/CHANGELOG

@@ -4,6 +4,8 @@
 
 --------------------------------------------------------------------------
   v.3.5-Alpha1
+	- Added timeout override on update_single_item because the function
+		is a lie
 	- Fix translations so it's not all german
 	- Genre Tag is now used as a 'Tag', Browse Genre removed
 	- Ignore getid3() iconv stuff doesn't seem to work

lib/class/catalog.class.php

@@ -1017,6 +1017,9 @@ class Catalog {
 	 */
 	public static function update_single_item($type,$id) { 
 
+		// Because single items are large numbers of things too
+		set_time_limit(0);
+
 		$songs = array();
 
 		switch ($type) {