Merge vector-2.4 branch back to trunk.

svn merge sandbox/vector-2.4/@2307 sandbox/vector-2.4/@HEAD trunk/openlayers/


git-svn-id: http://svn.openlayers.org/trunk/openlayers@2803 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

lib/OpenLayers/Feature.js

@@ -7,6 +7,7 @@
  * @class
  * 
  * @requires OpenLayers/Util.js
+ * @requires OpenLayers/Marker.js
  */
 OpenLayers.Feature = OpenLayers.Class.create();
 OpenLayers.Feature.prototype= {
@@ -151,5 +152,6 @@ OpenLayers.Feature.prototype= {
         this.popup.destroy() 
     },
     
+    /** @final @type String */
     CLASS_NAME: "OpenLayers.Feature"
 };