--- includes/behaviors/js/openlayers_behavior_popup.js	Tue Feb 16 11:44:07 2010
+++ includes/behaviors/js/openlayers_behavior_popup.js	Wed Jun 23 22:28:25 2010
@@ -12,8 +12,7 @@
  *  Formatted HTML
  */
 function openlayers_behavior_popup_popup_content(feature) {
-  return "<div class='openlayers-popup'>" + feature.attributes.name +"</div>" +
-         "<div class='openlayers-popup'>" + feature.attributes.description +"</div>";
+  return feature.attributes.popup_content;
 }
 
 var openlayers_behavior_popup_popup_select, openlayers_behavior_popup_selected_feature;