diff --git a/lib/OpenLayers/Format/WMSCapabilities/v1_1.js b/lib/OpenLayers/Format/WMSCapabilities/v1_1.js
index b548116bdf..170ae68e90 100644
--- a/lib/OpenLayers/Format/WMSCapabilities/v1_1.js
+++ b/lib/OpenLayers/Format/WMSCapabilities/v1_1.js
@@ -13,6 +13,21 @@
 OpenLayers.Format.WMSCapabilities.v1_1 = OpenLayers.Class(
     OpenLayers.Format.XML, {
     
+    /**
+     * Property: namespaces
+     * {Object} Mapping of namespace aliases to namespace URIs.
+     */
+    namespaces: {
+        wms: "http://www.opengis.net/wms",
+        xlink: "http://www.w3.org/1999/xlink",
+        xsi: "http://www.w3.org/2001/XMLSchema-instance"
+    },
+
+    /**
+     * Property: defaultPrefix
+     */
+    defaultPrefix: "wms",
+    
     /**
      * Constructor: OpenLayers.Format.WMSCapabilities.v1_1
      * Create an instance of one of the subclasses.
@@ -23,7 +38,6 @@ OpenLayers.Format.WMSCapabilities.v1_1 = OpenLayers.Class(
      */
     initialize: function(options) {
         OpenLayers.Format.XML.prototype.initialize.apply(this, [options]);
-        this.options = options;
     },
 
     /**
@@ -40,372 +54,57 @@ OpenLayers.Format.WMSCapabilities.v1_1 = OpenLayers.Class(
         if(typeof data == "string") {
             data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
         }
+        if(data && data.nodeType == 9) {
+            data = data.documentElement;
+        }
         var capabilities = {};
-        var root = data.documentElement;
-        this.runChildNodes(capabilities, root);
+        this.readNode(data, capabilities);
+    
+        // postprocess the layer list
+        this.postProcessLayers(capabilities);
+    
         return capabilities;
     },
-    
+
     /**
-     * Method: runChildNodes
+     * Method: postProcessLayers
+     * Post process the layers, so that the nested layer structure is converted
+     * to a flat layer list with only named layers.
+     *
+     * Parameters:
+     * capabilities - {Object} The object (structure) returned by the parser with
+     *     all the info from the GetCapabilities response.
      */
-    runChildNodes: function(obj, node) {
-        var children = node.childNodes;
-        var childNode, processor;
-        for(var i=0; i<children.length; ++i) {
-            childNode = children[i];
-            if(childNode.nodeType == 1) {
-                processor = this["read_cap_" + childNode.nodeName];
-                if(processor) {
-                    processor.apply(this, [obj, childNode]);
-                }
+    postProcessLayers: function(capabilities) {
+        if (capabilities.capability) {
+            capabilities.capability.layers = [];
+            var layers = capabilities.capability.nestedLayers;
+            for (var i=0, len = layers.length; i<len; ++i) {
+                var layer = layers[i];
+                this.processLayer(capabilities.capability, layer);
             }
         }
     },
-    
-    /**
-     * Method: read_cap_Service
-     */
-    read_cap_Service: function(capabilities, node) {
-        var service = {};
-        this.runChildNodes(service, node);
-        capabilities.service = service;
-    },
 
     /**
-     * Method: read_cap_Fees
-     */
-    read_cap_Fees: function(service, node) {
-        var fees = this.getChildValue(node);
-        if (fees && fees.toLowerCase() != "none") {
-            service.fees = fees;
-        }
-    },
-
-    /**
-     * Method: read_cap_AccessConstraints
-     */
-    read_cap_AccessConstraints: function(service, node) {
-        var constraints = this.getChildValue(node);
-        if (constraints && constraints.toLowerCase() != "none") {
-            service.accessConstraints = constraints;
-        }
-    },
-
-    /**
-     * Method: read_cap_ContactInformation
+     * Method: processLayer
+     * Recursive submethod of postProcessLayers. This function will among
+     * others deal with property inheritance.
+     *
+     * Parameters:
+     * capability - {Object} The capability part of the capabilities object
+     * layer - {Object} The layer that needs processing
+     * parentLayer - {Object} The parent layer of the respective layer
     */
-    read_cap_ContactInformation: function(service, node) {
-        var contact = {};
-        this.runChildNodes(contact, node);
-        service.contactInformation = contact;
-    },
-
-
-    /**
-     * Method: read_cap_ContactPersonPrimary
-     */
-    read_cap_ContactPersonPrimary: function(contact, node) {
-        var personPrimary = {};
-        this.runChildNodes(personPrimary, node);
-        contact.personPrimary = personPrimary;
-    },
-
-    /**
-     * Method: read_cap_ContactPerson
-     */
-    read_cap_ContactPerson: function(primaryPerson, node) {
-        var person = this.getChildValue(node);
-        if (person) {
-            primaryPerson.person = person;
+    processLayer: function(capability, layer, parentLayer) {
+        if (layer.formats === undefined) {
+            layer.formats = capability.request.getmap.formats;
         }
-    },
-
-    /**
-     * Method: read_cap_ContactOrganization
-     */
-    read_cap_ContactOrganization: function(primaryPerson, node) {
-        var organization = this.getChildValue(node);
-        if (organization) {
-            primaryPerson.organization = organization;
-        }
-    },
-
-    /**
-     * Method: read_cap_ContactPosition
-     */
-    read_cap_ContactPosition: function(contact, node) {
-        var position = this.getChildValue(node);
-        if (position) {
-            contact.position = position;
-        }
-    },
-
-    /**
-     * Method: read_cap_ContactAddress
-     */
-    read_cap_ContactAddress: function(contact, node) {
-        var contactAddress = {};
-        this.runChildNodes(contactAddress, node);
-        contact.contactAddress = contactAddress;
-    },
-
-    /**
-     * Method: read_cap_AddressType
-     */
-    read_cap_AddressType: function(contactAddress, node) {
-        var type = this.getChildValue(node);
-        if (type) {
-            contactAddress.type = type;
-        }
-    },
-
-    /**
-     * Method: read_cap_Address
-     */
-    read_cap_Address: function(contactAddress, node) {
-        var address = this.getChildValue(node);
-        if (address) {
-            contactAddress.address = address;
-        }
-    },
-
-    /**
-     * Method: read_cap_City
-     */
-    read_cap_City: function(contactAddress, node) {
-        var city = this.getChildValue(node);
-        if (city) {
-            contactAddress.city = city;
-        }
-    },
-
-    /**
-     * Method: read_cap_StateOrProvince
-     */
-    read_cap_StateOrProvince: function(contactAddress, node) {
-        var stateOrProvince = this.getChildValue(node);
-        if (stateOrProvince) {
-            contactAddress.stateOrProvince = stateOrProvince;
-        }
-    },
-
-    /**
-     * Method: read_cap_PostCode
-     */
-    read_cap_PostCode: function(contactAddress, node) {
-        var postcode = this.getChildValue(node);
-        if (postcode) {
-            contactAddress.postcode = postcode;
-        }
-    },
-
-    /**
-     * Method: read_cap_Country
-     */
-    read_cap_Country: function(contactAddress, node) {
-        var country = this.getChildValue(node);
-        if (country) {
-            contactAddress.country = country;
-        }
-    },
-
-    /**
-     * Method: read_cap_ContactVoiceTelephone
-     */
-    read_cap_ContactVoiceTelephone: function(contact, node) {
-        var phone = this.getChildValue(node);
-        if (phone) {
-            contact.phone = phone;
-        }
-    },
-
-    /**
-     * Method: read_cap_ContactFacsimileTelephone
-     */
-    read_cap_ContactFacsimileTelephone: function(contact, node) {
-        var fax = this.getChildValue(node);
-        if (fax) {
-            contact.fax = fax;
-        }
-    },
-
-    /**
-     * Method: read_cap_ContactElectronicMailAddress
-     */
-    read_cap_ContactElectronicMailAddress: function(contact, node) {
-        var email = this.getChildValue(node);
-        if (email) {
-            contact.email = email;
-        }
-    },
-
-    /**
-     * Method: read_cap_Capability
-     */
-    read_cap_Capability: function(capabilities, node) {
-        var capability = {
-            layers: []
-        };
-        this.runChildNodes(capability, node);
-        capabilities.capability = capability;
-    },
-    
-    /**
-     * Method: read_cap_Request
-     */
-    read_cap_Request: function(obj, node) {
-        var request = {};
-        this.runChildNodes(request, node);
-        obj.request = request;
-    },
-    
-    /**
-     * Method: read_cap_GetMap
-     */
-    read_cap_GetMap: function(request, node) {
-        var getmap = {
-            formats: []
-        };
-        this.runChildNodes(getmap, node);
-        request.getmap = getmap;
-    },
-    
-    /**
-     * Method: read_cap_GetCapabilities
-     */
-    read_cap_GetCapabilities: function(request, node) {
-        var getcapabilities = {
-            formats: []
-        };
-        this.runChildNodes(getcapabilities, node);
-        request.getcapabilities = getcapabilities;
-    },
-
-    /**
-     * Method: read_cap_GetFeatureInfo
-     */
-    read_cap_GetFeatureInfo: function(request, node) {
-        var getfeatureinfo = {
-            formats: []
-        };
-        this.runChildNodes(getfeatureinfo, node);
-        request.getfeatureinfo = getfeatureinfo;
-    },
-
-    /**
-     * Method: read_cap_DescribeLayer
-     */
-    read_cap_DescribeLayer: function(request, node) {
-        var describelayer = {
-            formats: []
-        };
-        this.runChildNodes(describelayer, node);
-        request.describelayer = describelayer;
-    },
-
-    /**
-     * Method: read_cap_GetLegendGraphic
-     */
-    read_cap_GetLegendGraphic: function(request, node) {
-        var getlegendgraphic = {
-            formats: []
-        };
-        this.runChildNodes(getlegendgraphic, node);
-        request.getlegendgraphic = getlegendgraphic;
-    },
-
-    /**
-     * Method: read_cap_GetStyles
-     */
-    read_cap_GetStyles: function(request, node) {
-        var getstyles = {
-            formats: []
-        };
-        this.runChildNodes(getstyles, node);
-        request.getstyles = getstyles;
-    },
-
-    /**
-     * Method: read_cap_PutStyles
-     */
-    read_cap_PutStyles: function(request, node) {
-        var putstyles = {
-            formats: []
-        };
-        this.runChildNodes(putstyles, node);
-        request.putstyles = putstyles;
-    },
-
-    /**
-     * Method: read_cap_Format
-     */
-    read_cap_Format: function(obj, node) {
-        var format = this.getChildValue(node);
-        if(obj.formats) {
-            obj.formats.push(format);
-        } else {
-            obj.format  = format;
-        }
-    },
-    
-    /**
-     * Method: read_cap_DCPType
-     * Super simplified HTTP href extractor.  Assumes the first online resource
-     *     will work.
-     */
-    read_cap_DCPType: function(obj, node) {
-        var children = node.getElementsByTagName("OnlineResource");
-        if(children.length > 0) {
-            this.read_cap_OnlineResource(obj, children[0]);
-        }
-    },
-
-    /**
-     * Method: read_cap_Exception
-     */
-    read_cap_Exception: function(capability, node) {
-        var exception = {
-            formats: []
-        };
-        this.runChildNodes(exception, node);
-        capability.exception = exception;
-    },
-
-    /**
-     * Method: read_cap_UserDefinedSymbolization
-     */
-    read_cap_UserDefinedSymbolization: function(capability, node) {
-        var userSymbols = {
-            supportSLD: parseInt(node.getAttribute("SupportSLD")) == 1,
-            userLayer: parseInt(node.getAttribute("UserLayer")) == 1,
-            userStyle: parseInt(node.getAttribute("UserStyle")) == 1,
-            remoteWFS: parseInt(node.getAttribute("RemoteWFS")) == 1
-        };
-        capability.userSymbols = userSymbols;
-    },
-
-    /**
-     * Method: read_cap_Layer
-     */
-    read_cap_Layer: function(capability, node, parentLayer) {
-        var layer = {
-            formats: capability.request.getmap.formats || [],
-            styles: [],
-            srs: {},
-            bbox: {},
-            dimensions: {},
-            metadataURLs: [],
-            authorityURLs: {},
-            identifiers: {},
-            keywords: []
-        };
 
         // deal with property inheritance
         if(parentLayer) {
             // add style
             layer.styles = layer.styles.concat(parentLayer.styles);
-
             var attributes = ["queryable",
                               "cascaded",
                               "fixedWidth",
@@ -423,330 +122,362 @@ OpenLayers.Format.WMSCapabilities.v1_1 = OpenLayers.Class(
                                "authorityURLs"];
             
             var key;
-            for (var i=0; i<attributes.length; i++) {
-                key = attributes[i];
+            for (var j=0; j<attributes.length; j++) {
+                key = attributes[j];
                 if (key in parentLayer) {
-                    layer[key] = parentLayer[key];
+                    // only take parent value if not present (null or undefined)
+                    if (layer[key] == null) {
+                        layer[key] = parentLayer[key];
+                    }
+                    // if attribute isn't present, and we haven't
+                    // inherited anything from a parent layer
+                    // set to default value
+                    if (layer[key] == null) {
+                        var intAttr = ["cascaded", "fixedWidth", "fixedHeight"];
+                        var boolAttr = ["queryable", "opaque", "noSubsets"];
+                        if (OpenLayers.Util.indexOf(intAttr, key) != -1) {
+                            layer[key] = 0;
+                        }
+                        if (OpenLayers.Util.indexOf(boolAttr, key) != -1) {
+                            layer[key] = false;
+                        }
+                    }
                 }
             }
 
-            for (var i=0; i<complexAttr.length; i++) {
-                key = complexAttr[i];
+            for (var j=0; j<complexAttr.length; j++) {
+                key = complexAttr[j];
                 layer[key] = OpenLayers.Util.extend(
-                    layer[key], parentLayer[key]
-                );
-            }
-
-        }
-
-        var intAttr = ["cascaded", "fixedWidth", "fixedHeight"];
-        var boolAttr = ["queryable", "opaque", "noSubsets"];
-
-        for (var i=0; i<intAttr.length; i++) {
-            var attr = intAttr[i];
-            var attrNode = node.getAttributeNode(attr);
-            if (attrNode && attrNode.specified) {
-                // if attribute is present, override inherited value
-                layer[attr] = parseInt(attrNode.value);
-            } else if (! (attr in layer)) {
-                // if attribute isn't present, and we haven't
-                // inherited anything from a parent layer
-                // set to default value
-                layer[attr] = 0;
-            }
-        }
-        for (var i=0; i<boolAttr.length; i++) {
-            var attr = boolAttr[i];
-            var attrNode = node.getAttributeNode(attr);
-            if (attrNode && attrNode.specified) {
-                // if attribute is present, override inherited value
-                var value = attrNode.value;
-                layer[attr] = ( value === "1" || value === "true" );
-            } else if (! (attr in layer)) {
-                // if attribute isn't present, and we haven't
-                // inherited anything from a parent layer
-                // set to default value
-                layer[attr] = false;
-            }
-        }
-        var children = node.childNodes;
-        var childNode, nodeName, processor;
-        for(var i=0; i<children.length; ++i) {
-            childNode = children[i];
-            nodeName = childNode.nodeName;
-            processor = this["read_cap_" + childNode.nodeName];
-            if(processor) {
-                if(nodeName == "Layer") {
-                    processor.apply(this, [capability, childNode, layer]);
-                } else {
-                    processor.apply(this, [layer, childNode]);
-                }
+                    layer[key], parentLayer[key]);
             }
         }
 
-        if(layer.name) {
-            var index = layer.name.indexOf(":");
-            if(index > 0) {
-                layer.prefix = layer.name.substring(0, index);
-            }
+        // process sublayers
+        for (var i=0, len=layer.nestedLayers.length; i<len; i++) {
+            var childLayer = layer.nestedLayers[i];
+            this.processLayer(capability, childLayer, layer);
+        }
+        
+        if (layer.name) {
             capability.layers.push(layer);
         }
+    
     },
     
     /**
-     * Method: read_cap_ScaleHint
-     * The Layer ScaleHint element has min and max attributes that relate to
-     *     the minimum and maximum resolution that the server supports.  The
-     *     values are pixel diagonals measured in meters (on the ground).
+     * Property: readers
+     * Contains public functions, grouped by namespace prefix, that will
+     *     be applied when a namespaced node is found matching the function
+     *     name.  The function will be applied in the scope of this parser
+     *     with two arguments: the node being read and a context object passed
+     *     from the parent.
      */
-    read_cap_ScaleHint: function(layer, node) {
-        var min = node.getAttribute("min");
-        var max = node.getAttribute("max");
-        var rad2 = Math.pow(2, 0.5);
-        var ipm = OpenLayers.INCHES_PER_UNIT["m"];
-        layer.maxScale = parseFloat(
-            ((min / rad2) * ipm * OpenLayers.DOTS_PER_INCH).toPrecision(13)
-        );
-        layer.minScale = parseFloat(
-            ((max / rad2) * ipm * OpenLayers.DOTS_PER_INCH).toPrecision(13)
-        );
-    },
-    
-    /**
-     * Method: read_cap_Name
-     */
-    read_cap_Name: function(obj, node) {
-        var name = this.getChildValue(node);
-        if(name) {
-            obj.name = name;
+    readers: {
+        "wms": {
+            "WMT_MS_Capabilities": function(node, obj) {
+                this.readChildNodes(node, obj);
+            },
+            "Service": function(node, obj) {
+                obj.service = {};
+                this.readChildNodes(node, obj.service);
+            },
+            "Name": function(node, obj) {
+                obj.name = this.getChildValue(node);
+            },
+            "Title": function(node, obj) {
+                obj.title = this.getChildValue(node);
+            },
+            "Abstract": function(node, obj) {
+                obj.abstract = this.getChildValue(node);
+            },
+            "OnlineResource": function(node, obj) {
+                obj.href = this.getAttributeNS(node, this.namespaces.xlink, 
+                    "href");
+            },
+            "ContactInformation": function(node, obj) {
+                obj.contactInformation = {};
+                this.readChildNodes(node, obj.contactInformation);
+            },
+            "ContactPersonPrimary": function(node, obj) {
+                obj.personPrimary = {};
+                this.readChildNodes(node, obj.personPrimary);
+            },
+            "ContactPerson": function(node, obj) {
+                obj.person = this.getChildValue(node);
+            },
+            "ContactOrganization": function(node, obj) {
+                obj.organization = this.getChildValue(node);
+            },
+            "ContactPosition": function(node, obj) {
+                obj.position = this.getChildValue(node);
+            },
+            "ContactAddress": function(node, obj) {
+                obj.contactAddress = {};
+                this.readChildNodes(node, obj.contactAddress);
+            },
+            "AddressType": function(node, obj) {
+                obj.type = this.getChildValue(node);
+            },
+            "Address": function(node, obj) {
+                obj.address = this.getChildValue(node);
+            },
+            "City": function(node, obj) {
+                obj.city = this.getChildValue(node);
+            },
+            "StateOrProvince": function(node, obj) {
+                obj.stateOrProvince = this.getChildValue(node);
+            },
+            "PostCode": function(node, obj) {
+                obj.postcode = this.getChildValue(node);
+            },
+            "Country": function(node, obj) {
+                obj.country = this.getChildValue(node);
+            },
+            "ContactVoiceTelephone": function(node, obj) {
+                obj.phone = this.getChildValue(node);
+            },
+            "ContactFacsimileTelephone": function(node, obj) {
+                obj.fax = this.getChildValue(node);
+            },
+            "ContactElectronicMailAddress": function(node, obj) {
+                obj.email = this.getChildValue(node);
+            },
+            "Fees": function(node, obj) {
+                var fees = this.getChildValue(node);
+                if (fees && fees.toLowerCase() != "none") {
+                    obj.fees = fees;
+                }
+            },
+            "AccessConstraints": function(node, obj) {
+                var constraints = this.getChildValue(node);
+                if (constraints && constraints.toLowerCase() != "none") {
+                    obj.accessConstraints = constraints;
+                }
+            },
+            "Capability": function(node, obj) {
+                obj.capability = {nestedLayers: []};
+                this.readChildNodes(node, obj.capability);
+            },
+            "Request": function(node, obj) {
+                obj.request = {};
+                this.readChildNodes(node, obj.request);
+            },
+            "GetCapabilities": function(node, obj) {
+                obj.getcapabilities = {formats: []};
+                this.readChildNodes(node, obj.getcapabilities);
+            },
+            "Format": function(node, obj) {
+                if (obj.formats instanceof Array) {
+                    obj.formats.push(this.getChildValue(node));
+                } else {
+                    obj.format = this.getChildValue(node);
+                }
+            },
+            "DCPType": function(node, obj) {
+                this.readChildNodes(node, obj);
+            },
+            "HTTP": function(node, obj) {
+                this.readChildNodes(node, obj);
+            },
+            "Get": function(node, obj) {
+                this.readChildNodes(node, obj);
+            },
+            "Post": function(node, obj) {
+                this.readChildNodes(node, obj);
+            },
+            "GetMap": function(node, obj) {
+                obj.getmap = {formats: []};
+                this.readChildNodes(node, obj.getmap);
+            },
+            "GetFeatureInfo": function(node, obj) {
+                obj.getfeatureinfo = {formats: []};
+                this.readChildNodes(node, obj.getfeatureinfo);
+            },
+            "DescribeLayer": function(node, obj) {
+                obj.describelayer = {formats: []};
+                this.readChildNodes(node, obj.describelayer);
+            },
+            "GetLegendGraphic": function(node, obj) {
+                obj.getlegendgraphic = {formats: []};
+                this.readChildNodes(node, obj.getlegendgraphic);
+            },
+            "GetStyles": function(node, obj) {
+                obj.getstyles = {formats: []};
+                this.readChildNodes(node, obj.getstyles);
+            },
+            "PutStyles": function(node, obj) {
+                obj.putstyles = {formats: []};
+                this.readChildNodes(node, obj.putstyles);
+            },
+            "Exception": function(node, obj) {
+                obj.exception = {formats: []};
+                this.readChildNodes(node, obj.exception);
+            },
+            "UserDefinedSymbolization": function(node, obj) {
+                var userSymbols = {
+                    supportSLD: parseInt(node.getAttribute("SupportSLD")) == 1,
+                    userLayer: parseInt(node.getAttribute("UserLayer")) == 1,
+                    userStyle: parseInt(node.getAttribute("UserStyle")) == 1,
+                    remoteWFS: parseInt(node.getAttribute("RemoteWFS")) == 1
+                };
+                obj.userSymbols = userSymbols;
+            },
+            "Layer": function(node, obj) {
+                var attrNode = node.getAttributeNode("queryable");
+                var queryable = (attrNode && attrNode.specified) ? 
+                    node.getAttribute("queryable") : null;
+                attrNode = node.getAttributeNode("cascaded");
+                var cascaded = (attrNode && attrNode.specified) ?
+                    node.getAttribute("cascaded") : null;
+                attrNode = node.getAttributeNode("opaque");
+                var opaque = (attrNode && attrNode.specified) ?
+                    node.getAttribute('opaque') : null;
+                var noSubsets = node.getAttribute('noSubsets');
+                var fixedWidth = node.getAttribute('fixedWidth');
+                var fixedHeight = node.getAttribute('fixedHeight');
+                var layer = {nestedLayers: [], styles: [], srs: {}, 
+                    metadataURLs: [], bbox: {}, dimensions: {},
+                    authorityURLs: {}, identifiers: {}, keywords: [],
+                    queryable: (queryable && queryable !== "") ? 
+                        ( queryable === "1" || queryable === "true" ) : null,
+                    cascaded: (cascaded !== null) ? parseInt(cascaded) : null,
+                    opaque: opaque ? 
+                        (opaque === "1" || opaque === "true" ) : null,
+                    noSubsets: (noSubsets !== null) ? 
+                        ( noSubsets === "1" || noSubsets === "true" ) : null,
+                    fixedWidth: (fixedWidth != null) ? 
+                        parseInt(fixedWidth) : null,
+                    fixedHeight: (fixedHeight != null) ? 
+                        parseInt(fixedHeight) : null
+                };
+                obj.nestedLayers.push(layer);
+                this.readChildNodes(node, layer);
+            },
+            "LatLonBoundingBox": function(node, obj) {
+                obj.llbbox = [
+                    parseFloat(node.getAttribute("minx")),
+                    parseFloat(node.getAttribute("miny")),
+                    parseFloat(node.getAttribute("maxx")),
+                    parseFloat(node.getAttribute("maxy"))
+                ];
+            },
+            "BoundingBox": function(node, obj) {
+                var bbox = {};
+                bbox.srs  = node.getAttribute("SRS");
+                bbox.bbox = [
+                    parseFloat(node.getAttribute("minx")),
+                    parseFloat(node.getAttribute("miny")),
+                    parseFloat(node.getAttribute("maxx")),
+                    parseFloat(node.getAttribute("maxy"))
+                ];
+                var res = {
+                    x: parseFloat(node.getAttribute("resx")),
+                    y: parseFloat(node.getAttribute("resy"))
+                };
+
+                if (! (isNaN(res.x) && isNaN(res.y))) {
+                    bbox.res = res;
+                }
+                obj.bbox[bbox.srs] = bbox;
+            },
+            "Attribution": function(node, obj) {
+                obj.attribution = {};
+                this.readChildNodes(node, obj.attribution);
+            },
+            "LogoURL": function(node, obj) {
+                obj.logo = {
+                    width: node.getAttribute("width"),
+                    height: node.getAttribute("height")
+                };
+                this.readChildNodes(node, obj.logo);
+            },
+            "Style": function(node, obj) {
+                var style = {};
+                obj.styles.push(style);
+                this.readChildNodes(node, style);
+            },
+            "LegendURL": function(node, obj) {
+                var legend = {
+                    width: node.getAttribute("width"),
+                    height: node.getAttribute("height")
+                };
+                obj.legend = legend;
+                this.readChildNodes(node, legend);
+            },
+            "SRS": function(node, obj) {
+                obj.srs[this.getChildValue(node)] = true;
+            },
+            "ScaleHint": function(node, obj) {
+                var min = node.getAttribute("min");
+                var max = node.getAttribute("max");
+                var rad2 = Math.pow(2, 0.5);
+                var ipm = OpenLayers.INCHES_PER_UNIT["m"];
+                obj.maxScale = parseFloat(
+                    ((min / rad2) * ipm * 
+                        OpenLayers.DOTS_PER_INCH).toPrecision(13)
+                );
+                obj.minScale = parseFloat(
+                    ((max / rad2) * ipm * 
+                        OpenLayers.DOTS_PER_INCH).toPrecision(13)
+                );
+            },
+            "MetadataURL": function(node, obj) {
+                var metadataURL = {type: node.getAttribute("type")};
+                obj.metadataURLs.push(metadataURL);
+                this.readChildNodes(node, metadataURL);
+            },
+            "Dimension": function(node, obj) {
+                var name = node.getAttribute("name").toLowerCase();
+                var dim = {
+                    name: name,
+                    units: node.getAttribute("units"),
+                    unitsymbol: node.getAttribute("unitSymbol")
+                };
+                obj.dimensions[dim.name] = dim;
+            },
+            "Extent": function(node, obj) {
+                var name = node.getAttribute("name").toLowerCase();
+                if (name in obj["dimensions"]) {
+                    var extent = obj.dimensions[name];
+                    extent.nearestVal = 
+                        node.getAttribute("nearestValue") === "1";
+                    extent.multipleVal = 
+                        node.getAttribute("multipleValues") === "1";
+                    extent.current = node.getAttribute("current") === "1";
+                    extent["default"] = node.getAttribute("default") || "";
+                    var values = this.getChildValue(node);
+                    extent.values = values.split(",");
+                }
+            },
+            "DataURL": function(node, obj) {
+                obj.dataURL = {};
+                this.readChildNodes(node, obj.dataURL);
+            },
+            "FeatureListURL": function(node, obj) {
+                obj.featureListURL = {};
+                this.readChildNodes(node, obj.featureListURL);
+            },
+            "AuthorityURL": function(node, obj) {
+                var name = node.getAttribute("name");
+                var authority = {};
+                this.readChildNodes(node, authority);
+                obj.authorityURLs[name] = authority.href;
+            },
+            "Identifier": function(node, obj) {
+                var authority = node.getAttribute("authority");
+                obj.identifiers[authority] = this.getChildValue(node);
+            },
+            "KeywordList": function(node, obj) {
+                this.readChildNodes(node, obj);
+            },
+            "Keyword": function(node, obj) {
+                if (obj.keywords) {
+                    obj.keywords.push(this.getChildValue(node));
+                }
+            }
         }
     },
 
-    /**
-     * Method: read_cap_Title
-     */
-    read_cap_Title: function(obj, node) {
-        var title = this.getChildValue(node);
-        if(title) {
-            obj.title = title;
-        }
-    },
-
-    /**
-     * Method: read_cap_Abstract
-     */
-    read_cap_Abstract: function(obj, node) {
-        var abst = this.getChildValue(node);
-        if(abst) {
-            obj["abstract"] = abst;
-        }
-    },
-    
-    /**
-     * Method: read_cap_Attribution
-     */
-    read_cap_Attribution: function(obj, node) {
-        var attribution = {};
-        this.runChildNodes(attribution, node);
-        obj.attribution = attribution;
-    },
-    
-    /**
-     * Method: read_cap_LogoURL
-     */
-    read_cap_LogoURL: function(obj, node) {
-        obj.logo = {
-            width: node.getAttribute("width"),
-            height: node.getAttribute("height")
-        };
-        this.runChildNodes(obj.logo, node);
-    },
-    
-    /**
-     * Method: read_cap_MetadataURL
-     */
-    read_cap_MetadataURL: function(layer, node) {
-        var metadataURL = {};
-        this.runChildNodes(metadataURL, node);
-        metadataURL.type = node.getAttribute("type");
-        layer.metadataURLs.push(metadataURL);
-    },
-    
-    /**
-     * Method: read_cap_DataURL
-     */
-    read_cap_DataURL: function(layer, node) {
-        layer.dataURL = {};
-        this.runChildNodes(layer.dataURL, node);
-    },
-
-    /**
-     * Method: read_cap_FeatureListURL
-     */
-    read_cap_FeatureListURL: function(layer, node) {
-        layer.featureListURL = {};
-        this.runChildNodes(layer.featureListURL, node);
-    },
-
-    /**
-     * Method: read_cap_AuthorityURL
-     */
-    read_cap_AuthorityURL: function(layer, node) {
-        var name = node.getAttribute("name");
-        if (! (name in layer.authorityURLs)) {
-            var authority = {};
-            this.runChildNodes(authority, node);
-            layer.authorityURLs[name] = authority.href;
-        } else {
-            // A child Layer SHALL NOT define an AuthorityURL with the
-            // same name attribute as one inherited from a parent
-            return;
-        }
-    },
-
-    /**
-     * Method: read_cap_Identifier
-    */
-    read_cap_Identifier: function(layer, node) {
-        var authority = node.getAttribute("authority");
-
-        if (authority in layer.authorityURLs) {
-            layer.identifiers[authority] = this.getChildValue(node);
-        } else {
-            // A layer SHALL NOT declare an Identifier unless a
-            // corresponding authorityURL has been declared or
-            // inherited earlier in the Capabilities XML
-            return;
-        }
-
-    },
-
-    /**
-     * Method: read_cap_KeywordList
-     */
-    read_cap_KeywordList: function(layer, node) {
-        var obj = layer;
-        this.runChildNodes(obj, node);
-    },
-    
-    /**
-     * Method: read_cap_Keyword
-     */
-    read_cap_Keyword: function(obj, node) {
-        if(obj.keywords) {
-            obj.keywords.push(this.getChildValue(node));
-        }
-    },
-
-    /**
-     * Method: read_cap_LatLonBoundingBox
-     */
-    read_cap_LatLonBoundingBox: function(layer, node) {
-        layer.llbbox = [
-            parseFloat(node.getAttribute("minx")),
-            parseFloat(node.getAttribute("miny")),
-            parseFloat(node.getAttribute("maxx")),
-            parseFloat(node.getAttribute("maxy"))
-        ];
-    },
-    
-    /**
-     * Method: read_cap_BoundingBox
-     */
-    read_cap_BoundingBox: function(layer, node) {
-        var bbox = {};
-        bbox.srs  = node.getAttribute("SRS");
-        bbox.bbox = [
-            parseFloat(node.getAttribute("minx")),
-            parseFloat(node.getAttribute("miny")),
-            parseFloat(node.getAttribute("maxx")),
-            parseFloat(node.getAttribute("maxy"))
-        ];
-        var res = {
-            x: parseFloat(node.getAttribute("resx")),
-            y: parseFloat(node.getAttribute("resy"))
-        };
-
-        if (! (isNaN(res.x) && isNaN(res.y))) {
-            bbox.res = res;
-        }
-        layer.bbox[bbox.srs] = bbox;
-    },
-
-    /**
-     * Method: read_cap_Style
-     */
-    read_cap_Style: function(layer, node) {
-        var style = {};
-        this.runChildNodes(style, node);
-        layer.styles.push(style);
-    },
-
-    /**
-     * Method: read_cap_Dimension
-     */
-    read_cap_Dimension: function(layer, node) {
-        var name = node.getAttribute("name").toLowerCase();
-
-        if (name in layer["dimensions"]) {
-            // "A child SHALL NOT redefine a Dimension with the same
-            // name attribute as one that was inherited"
-            return;
-        }
-
-        var dim = {
-            name: name,
-            units: node.getAttribute("units"),
-            unitsymbol: node.getAttribute("unitSymbol")
-        };
-
-        layer.dimensions[dim.name] = dim;
-    },
-
-    /**
-     * Method: read_cap_Extent
-     */
-    read_cap_Extent: function(layer, node) {
-        var name   = node.getAttribute("name").toLowerCase();
-
-        if (name in layer["dimensions"]) {
-            var extent = layer.dimensions[name];
-
-            extent.nearestVal = node.getAttribute("nearestValue") === "1";
-            extent.multipleVal = node.getAttribute("multipleValues") === "1";
-            extent.current = node.getAttribute("current") === "1";
-            extent["default"] = node.getAttribute("default") || "";
-            var values = this.getChildValue(node);
-            extent.values = values.split(",");
-        } else {
-            // A layer SHALL NOT declare an Extent unless a Dimension
-            // with the same name has been declared or inherited
-            // earlier in the Capabilities XML
-            return;
-        }
-
-    },
-
-    /**
-     * Method: read_cap_LegendURL
-     */
-    read_cap_LegendURL: function(style, node) {
-        style.legend = {
-            width: node.getAttribute("width"),
-            height: node.getAttribute("height")
-        };
-        this.runChildNodes(style.legend, node);
-    },
-    
-    /**
-     * Method: read_cap_OnlineResource
-     */
-    read_cap_OnlineResource: function(obj, node) {
-        obj.href = this.getAttributeNS(
-            node, "http://www.w3.org/1999/xlink", "href"
-        );
-    },
-
     CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1_1" 
 
 });
diff --git a/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js b/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js
index 2b4a5dd437..67cbdf1110 100644
--- a/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js
+++ b/lib/OpenLayers/Format/WMSCapabilities/v1_1_0.js
@@ -33,14 +33,23 @@ OpenLayers.Format.WMSCapabilities.v1_1_0 = OpenLayers.Class(
     },
 
     /**
-     * Method: read_cap_SRS
+     * Property: readers
+     * Contains public functions, grouped by namespace prefix, that will
+     *     be applied when a namespaced node is found matching the function
+     *     name.  The function will be applied in the scope of this parser
+     *     with two arguments: the node being read and a context object passed
+     *     from the parent.
      */
-    read_cap_SRS: function(layer, node) {
-        var srs = this.getChildValue(node);
-        var values = srs.split(/ +/);
-        for (var i=0, len=values.length; i<len; i++) {
-            layer.srs[values[i]] = true;
-        }
+    readers: {
+        "wms": OpenLayers.Util.applyDefaults({
+            "SRS": function(node, obj) {
+                var srs = this.getChildValue(node);
+                var values = srs.split(/ +/);
+                for (var i=0, len=values.length; i<len; i++) {
+                    obj.srs[values[i]] = true;
+                }
+            }
+        }, OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers["wms"])
     },
 
     CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1_1_0" 
diff --git a/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js b/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js
index d1f8904f25..febad654a0 100644
--- a/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js
+++ b/lib/OpenLayers/Format/WMSCapabilities/v1_1_1.js
@@ -33,19 +33,28 @@ OpenLayers.Format.WMSCapabilities.v1_1_1 = OpenLayers.Class(
     },
 
     /**
-     * Method: read_cap_SRS
+     * Property: readers
+     * Contains public functions, grouped by namespace prefix, that will
+     *     be applied when a namespaced node is found matching the function
+     *     name.  The function will be applied in the scope of this parser
+     *     with two arguments: the node being read and a context object passed
+     *     from the parent.
      */
-    read_cap_SRS: function(layer, node) {
-        var srs = this.getChildValue(node);
-        if (srs.indexOf(" ")) {
-            // v1.1.0 style SRS
-            var values = srs.split(/ +/);
-            for (var i=0, len=values.length; i<len; i++) {
-                layer.srs[values[i]] = true;
+    readers: {
+        "wms": OpenLayers.Util.applyDefaults({
+            "SRS": function(node, obj) {
+                var srs = this.getChildValue(node);
+                if (srs.indexOf(" ")) {
+                    // v1.1.0 style SRS
+                    var values = srs.split(/ +/);
+                    for (var i=0, len=values.length; i<len; i++) {
+                        obj.srs[values[i]] = true;
+                    }
+                } else {
+                    obj.srs[srs] = true;
+                }
             }
-        } else {
-            layer.srs[srs] = true;
-        }
+        }, OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers["wms"])
     },
 
     CLASS_NAME: "OpenLayers.Format.WMSCapabilities.v1_1_1" 
diff --git a/lib/OpenLayers/Format/XML.js b/lib/OpenLayers/Format/XML.js
index 211e05ec9a..0c0a2cbcae 100644
--- a/lib/OpenLayers/Format/XML.js
+++ b/lib/OpenLayers/Format/XML.js
@@ -617,7 +617,7 @@ OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, {
         if(!obj) {
             obj = {};
         }
-        var group = this.readers[this.namespaceAlias[node.namespaceURI]];
+        var group = this.readers[node.namespaceURI ? this.namespaceAlias[node.namespaceURI]: this.defaultPrefix];
         if(group) {
             var local = node.localName || node.nodeName.split(":").pop();
             var reader = group[local] || group["*"];