Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	9 Nov 2007 09:01:50 -0000	1.24
+++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	10 Nov 2007 13:38:08 -0000	1.25
@@ -396,7 +396,7 @@
     set xml [$r set data]
     set charset utf-8
     regexp {^<\?xml\s+version\s*=\s*\S+\s+encoding\s*=\s*[\"'](\S+)[\"']} $xml _ charset
-    return [encoding convertfrom $charset $xml]
+    return [encoding convertfrom [string tolower $charset] $xml]
   }
 
   RSS-client instproc parse {data} {
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.180 -r1.181
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 Nov 2007 13:32:01 -0000	1.180
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 Nov 2007 13:38:08 -0000	1.181
@@ -449,14 +449,14 @@
     If the page_name does not contain a language prefix,
     the language prefix of the including page is used.
   } {
-    if {$source ne ""} {
+    if {$page_name ne ""} {
       set page ""
       #
       # take a local copy of the package_id, since it is possible
       # that the variable package_id might changed to another instance.
       #
       set package_id [my package_id]
-      if {[regexp {^/(/.+)$} $source _ url]} {
+      if {[regexp {^/(/.+)$} $page_name _ url]} {
 	#
 	# Handle cross package resolve requests
 	# Note, that package::initialize might change the package id.
@@ -484,11 +484,11 @@
       } else {
 	set last_context [expr {[$package_id exists context] ? [$package_id context] : "::xo::cc"}]
 	$package_id context [::xo::Context new -volatile]
-	set page [$package_id resolve_page $source __m]
+	set page [$package_id resolve_page $page_name __m]
 	$package_id context $last_context
       }
       if {$page eq ""} {
-	error "Cannot find page '$source'"
+	error "Cannot find page '$page_name'"
       }
       $page destroy_on_cleanup
     } else {