From 7e326f97e2e9b4360d0511cc725229a03a410d15 Mon Sep 17 00:00:00 2001
From: tschaub <tim.schaub@gmail.com>
Date: Wed, 8 Aug 2012 11:41:33 -0600
Subject: [PATCH] Doc fix for merge method.

---
 lib/OpenLayers/Strategy/Fixed.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/OpenLayers/Strategy/Fixed.js b/lib/OpenLayers/Strategy/Fixed.js
index ea81f5ed2a..6b38b0b9c9 100644
--- a/lib/OpenLayers/Strategy/Fixed.js
+++ b/lib/OpenLayers/Strategy/Fixed.js
@@ -106,7 +106,8 @@ OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
      *
      * Parameters:
      * mapProjection - {<OpenLayers.Projection>} the map projection
-     * resp - {Object} options to pass to protocol read.
+     * resp - {<OpenLayers.Protocol.Response>} The response object passed
+     *      by the protocol.
      */
     merge: function(mapProjection, resp) {
         var layer = this.layer;