diff -urp -N date/date_popup/date_popup.js date-new/date_popup/date_popup.js
--- date/date_popup/date_popup.js	2009-01-12 09:23:25.000000000 -0800
+++ date-new/date_popup/date_popup.js	2009-07-02 23:40:04.000000000 -0700
@@ -18,10 +18,20 @@ Drupal.behaviors.date_popup = function (
             break;
 
           case 'timeEntry':
+           /* disables existing time picker
             $(this)
               .timeEntry(datePopup.settings)
               .addClass('date-popup-init')
               .focus();
+            */
+            var periods = ["AM","PM"];
+            $(this).timepickr({
+              format24: "{h:02.d}:{m:02.d}{suffix:s}",
+              convention: 24,
+              prefix: periods,
+              suffix: periods
+             });
+
             break;
         }
       }
diff -urp -N date/date_popup/date_popup.module date-new/date_popup/date_popup.module
--- date/date_popup/date_popup.module	2009-05-12 05:57:45.000000000 -0700
+++ date-new/date_popup/date_popup.module	2009-07-02 23:36:24.000000000 -0700
@@ -37,7 +37,17 @@ function date_popup_load() {
   else {
     drupal_add_js($path .'/lib/ui.datepicker.js');
   }
-  drupal_add_js($path .'/lib/jquery.timeentry.pack.js');
+// drupal_add_js($path .'/lib/jquery.timeentry.pack.js');
+
+  // Substitute ui-timepickr...
+  drupal_add_css( $path . '/ui-timepickr/dist/themes/default/ui.core.css');
+  drupal_add_css( $path . '/ui-timepickr/dist/themes/default/ui.dropslide.css');
+  drupal_add_css( $path . '/ui-timepickr/dist/themes/default/ui.timepickr.css');
+  drupal_add_js( $path . '/ui-timepickr/page/jquery.ui.all.js');
+  drupal_add_js( $path . '/ui-timepickr/page/jquery.utils.js');
+  drupal_add_js( $path . '/ui-timepickr/page/jquery.strings.js');
+  drupal_add_css( $path . '/ui-timepickr/dist/jquery.timepickr.css');
+  drupal_add_js( $path . '/ui-timepickr/dist/ui.timepickr.js');
   $loaded = TRUE;
 }
 
@@ -46,7 +56,7 @@ function date_popup_load() {
  */
 function date_popup_init() {
   drupal_add_css(drupal_get_path('module', 'date_popup')  .'/themes/datepicker.css');
-  drupal_add_css(drupal_get_path('module', 'date_popup')  .'/themes/timeentry.css');
+//  drupal_add_css(drupal_get_path('module', 'date_popup')  .'/themes/timeentry.css');
 }
 
  /**
@@ -495,4 +505,4 @@ function theme_date_popup($element) {
     $output = $element['#children'];
   }
   return '<div class="'. $class .'">'. theme('form_element', $element, $output) .'</div>';
-}
\ No newline at end of file
+}