Index: ahah_helper.module
===================================================================
--- ahah_helper.module	(revision 2996)
+++ ahah_helper.module	(working copy)
@@ -88,12 +88,12 @@
   // currently invisible. That way, we can restore the last entered value
   // when a user switched to Personal usage and back to Company usage.
   if (isset($form_state['values'])) {
-    // $form_state['storage'] must be initialized for array_smart_merge() to
+    // $form_state['storage'] must be initialized for ahah_helper_array_smart_merge() to
     // work.
     if (!isset($form_state['storage'])) {
       $form_state['storage'] = array();
     }
-    $form_state['storage'] = array_smart_merge($form_state['storage'], $form_state['values']);
+    $form_state['storage'] = ahah_helper_array_smart_merge($form_state['storage'], $form_state['values']);
   }
 
   // Add our JS file, which has some Drupal core JS overrides.
@@ -265,11 +265,11 @@
  *
  * From: http://www.php.net/manual/en/function.array-merge-recursive.php#82976.
  */
-function array_smart_merge($array, $override) {
+function ahah_helper_array_smart_merge($array, $override) {
   if (is_array($array) && is_array($override)) {
     foreach ($override as $k => $v) {
       if (isset($array[$k]) && is_array($v) && is_array($array[$k])) {
-        $array[$k] = array_smart_merge($array[$k], $v);
+        $array[$k] = ahah_helper_array_smart_merge($array[$k], $v);
       }
       else {
         $array[$k] = $v;