bug 893: Fixed typo in includes/temp_functions.php dres ->$res
bug 1009: Fixed xml-marker
bug 1130: fixed xml-marker
Merge branch 'bug-893' into testserver-stable
Merge branch 'bug-1009' into testserver-stable
Merge branch 'bug-1130' into testserver-stable