diff --git a/mozilla/calendar/resources/content/datetimepickers/datepicker.css b/mozilla/calendar/resources/content/datetimepickers/datepicker.css
index 027ac6b9d4d..ac8bc5b6da0 100755
--- a/mozilla/calendar/resources/content/datetimepickers/datepicker.css
+++ b/mozilla/calendar/resources/content/datetimepickers/datepicker.css
@@ -1,4 +1,4 @@
-@import url("chrome://calendar/content/datetimepickers/calendar.css");
+@import url("chrome://calendar/content/datetimepickers/minimonth.css");
 
 datepicker {
   -moz-binding: url("chrome://calendar/content/datetimepickers/datepicker.xbl#datepicker");
diff --git a/mozilla/calendar/resources/content/datetimepickers/datepicker.xbl b/mozilla/calendar/resources/content/datetimepickers/datepicker.xbl
index 66d6e14870b..ccce31ed7c2 100755
--- a/mozilla/calendar/resources/content/datetimepickers/datepicker.xbl
+++ b/mozilla/calendar/resources/content/datetimepickers/datepicker.xbl
@@ -103,7 +103,7 @@
             <xul:menu class="datepicker-button" xbl:inherits="disabled">
                 <xul:menupopup popupanchor="bottomright" popupalign="topright" 
                     onpopupshowing="onPopup()">
-                    <xul:calendar onchange="this.kDatePicker.clickDate(this); "/>
+                    <xul:minimonth onchange="this.kDatePicker.clickDate(this); "/>
                 </xul:menupopup>
             </xul:menu>
 
diff --git a/mozilla/calendar/resources/content/datetimepickers/calendar.css b/mozilla/calendar/resources/content/datetimepickers/minimonth.css
similarity index 56%
rename from mozilla/calendar/resources/content/datetimepickers/calendar.css
rename to mozilla/calendar/resources/content/datetimepickers/minimonth.css
index 9d72575ed49..18d38bea0b8 100755
--- a/mozilla/calendar/resources/content/datetimepickers/calendar.css
+++ b/mozilla/calendar/resources/content/datetimepickers/minimonth.css
@@ -1,20 +1,20 @@
 
-calendar {
-	-moz-binding: url("chrome://calendar/content/datetimepickers/calendar.xbl#calendar");
+minimonth {
+	-moz-binding: url("chrome://calendar/content/datetimepickers/minimonth.xbl#minimonth");
 }
 
-.cal-mainbox {
+.minimonth-mainbox {
 	min-width: 130px;
 	background-color: #ffffff;
 	border: 1px outset #ffffff;
 	padding: 0px;
 }
 
-.cal-month-box {
+.minimonth-month-box {
 	background-color: #EEEEEE;
 }
 
-.cal-month-name {
+.minimonth-month-name {
 	font-family: Arial;
 	font-size: 12pt;
 	font-weight: bold;
@@ -22,76 +22,76 @@ calendar {
 	text-align: center;
 }
 
-.cal-navbtn {
+.minimonth-navbtn {
 	min-width: 10px;
-	-moz-binding: url("chrome://calendar/content/datetimepickers/calendar.xbl#cal-navbtn");
+	-moz-binding: url("chrome://calendar/content/datetimepickers/minimonth.xbl#minimonth-navbtn");
 }
 
-.cal-navbtn[dir="-1"] {
+.minimonth-navbtn[dir="-1"] {
 	background: url("chrome://calendar/skin/datetimepickers/left-arrow.gif") no-repeat 50% 50%;
 }
 
-.cal-navbtn[dir="1"] {
+.minimonth-navbtn[dir="1"] {
 	background: url("chrome://calendar/skin/datetimepickers/right-arrow.gif") no-repeat 50% 50%;
 }
 
-.cal-navbtn[dir="-1"]:hover {
+.minimonth-navbtn[dir="-1"]:hover {
 	background: url("chrome://calendar/skin/datetimepickers/left-arrow-hover.gif") no-repeat 50% 50%;
 }
 
-.cal-navbtn[dir="1"]:hover {
+.minimonth-navbtn[dir="1"]:hover {
 	background: url("chrome://calendar/skin/datetimepickers/right-arrow-hover.gif") no-repeat 50% 50%;
 }
 
-.cal-navbtn:active {
+.minimonth-navbtn:active {
 	left: 2px;
 	top: 2px;
 }
 
-.cal-cal-box {
+.minimonth-cal-box {
 }
 
-.cal-header {
+.minimonth-header {
 	font-family: Arial;
 	color: blue;
 	text-align: center;
 }
 
-.cal-row-body {
+.minimonth-row-body {
 }
 
-.cal-day {
+.minimonth-day {
 	font-family: Arial;
 	color: #000000;
 	border: 1px solid transparent;
 	text-align: center;
-	-moz-binding: url("chrome://calendar/content/datetimepickers/calendar.xbl#cal-day");
+	-moz-binding: url("chrome://calendar/content/datetimepickers/minimonth.xbl#minimonth-day");
 }
 
-.cal-day[othermonth="true"] {
+.minimonth-day[othermonth="true"] {
 	color: #d2d2d2;
 }
 
-.cal-day[budy="true"] {
+.minimonth-day[budy="true"] {
 	font-weight : bold;
 }
 
-.cal-day[selected="true"] {
+.minimonth-day[selected="true"] {
 	background-color: #778899;
 	color: #ffffff;
 }
 
-.cal-day[busy="true"]
+.minimonth-day[busy="true"]
 {
    font-weight    : bold;
 }
 
-.cal-day:hover {
+.minimonth-day:hover {
 	color: #ff0000;
 	border: 1px solid #d2d2d2;
 }
 
-.cal-day:active {
+.minimonth-day:active {
 	background-color: #d2d2d2;
 }
 
diff --git a/mozilla/calendar/resources/content/datetimepickers/calendar.xbl b/mozilla/calendar/resources/content/datetimepickers/minimonth.xbl
similarity index 70%
rename from mozilla/calendar/resources/content/datetimepickers/calendar.xbl
rename to mozilla/calendar/resources/content/datetimepickers/minimonth.xbl
index 22662bfe133..23026ab7113 100755
--- a/mozilla/calendar/resources/content/datetimepickers/calendar.xbl
+++ b/mozilla/calendar/resources/content/datetimepickers/minimonth.xbl
@@ -1,86 +1,103 @@
 <?xml version="1.0"?>
 
-<bindings id="xulCalendar"
+<!--
+/* MiniMonth Calendar: day-of-month grid XBL component.
+   Displays month name above days of month in grid, by week rows.
+   Arrows beside month move forward or back a month.
+   Clicking on a day cell calls onchange attribute.
+   Clicking on month arrows calls onmonthchange attribute.
+
+   Used in datepicker.xbl and as mini-month in calendar.xul of Calendar.
+
+   At site, can provide id, and code to run when value changed by picker.
+     <calendar id="my-date-picker" onchange="myDatePick( this );"/>
+
+   May get/set value in javascript with 
+     document.getElementById("my-date-picker").value = new Date();
+*/
+-->
+<bindings id="xulMiniMonth"
     xmlns="http://www.mozilla.org/xbl"
+    xmlns:xbl="http://www.mozilla.org/xbl"
     xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <binding id="calendar" extends="xul:box">
+    <binding id="minimonth" extends="xul:box" xbl:inherits="onchange,onmonthchange">
 
         <!-- ::::::::::::::::: CONTENT ::::::::::::::::::::::::: -->
         <content>
 
-        <xul:vbox class="cal-mainbox"  flex="1">
-          <xul:hbox class="cal-month-box">
-            <xul:image class="cal-navbtn" dir="-1"/>
+        <xul:vbox class="minimonth-mainbox"  flex="1">
+          <xul:hbox class="minimonth-month-box">
+            <xul:image class="minimonth-navbtn" dir="-1"/>
             <xul:spacer flex="1"/>
-            <xul:text id="month-name" class="cal-month-name" value="Month"/>
+            <xul:text id="month-name" class="minimonth-month-name" value="Month"/>
             <xul:spacer flex="1"/>
-            <xul:image class="cal-navbtn" dir="1"/>
+            <xul:image class="minimonth-navbtn" dir="1"/>
           </xul:hbox>
-          <xul:vbox class="cal-cal-box" flex="1">
-            <xul:hbox class="cal-row-head" equalsize="always">
-                <xul:text class="cal-header" flex="1"/>
-                <xul:text class="cal-header" flex="1"/>
-                <xul:text class="cal-header" flex="1"/>
-                <xul:text class="cal-header" flex="1"/>
-                <xul:text class="cal-header" flex="1"/>
-                <xul:text class="cal-header" flex="1"/>
-                <xul:text class="cal-header" flex="1"/>
+          <xul:vbox class="minimonth-cal-box" flex="1">
+            <xul:hbox class="minimonth-row-head" equalsize="always">
+                <xul:text class="minimonth-header" flex="1"/>
+                <xul:text class="minimonth-header" flex="1"/>
+                <xul:text class="minimonth-header" flex="1"/>
+                <xul:text class="minimonth-header" flex="1"/>
+                <xul:text class="minimonth-header" flex="1"/>
+                <xul:text class="minimonth-header" flex="1"/>
+                <xul:text class="minimonth-header" flex="1"/>
             </xul:hbox>
-            <xul:hbox class="cal-row-body" equalsize="always" flex="1">
-                <xul:text class="cal-day" flex="1" />
-                <xul:text class="cal-day" flex="1" />
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
+            <xul:hbox class="minimonth-row-body" equalsize="always" flex="1">
+                <xul:text class="minimonth-day" flex="1" />
+                <xul:text class="minimonth-day" flex="1" />
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
             </xul:hbox>
-            <xul:hbox class="cal-row-body" equalsize="always" flex="1">
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
+            <xul:hbox class="minimonth-row-body" equalsize="always" flex="1">
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
             </xul:hbox>
-            <xul:hbox class="cal-row-body" equalsize="always" flex="1">
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
+            <xul:hbox class="minimonth-row-body" equalsize="always" flex="1">
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
             </xul:hbox>
-            <xul:hbox class="cal-row-body" equalsize="always" flex="1">
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
+            <xul:hbox class="minimonth-row-body" equalsize="always" flex="1">
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
             </xul:hbox>
-            <xul:hbox class="cal-row-body" equalsize="always" flex="1">
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
+            <xul:hbox class="minimonth-row-body" equalsize="always" flex="1">
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
             </xul:hbox>
-            <xul:hbox class="cal-row-body" equalsize="always" flex="1">
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
-                <xul:text class="cal-day" flex="1"/>
+            <xul:hbox class="minimonth-row-body" equalsize="always" flex="1">
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
+                <xul:text class="minimonth-day" flex="1"/>
             </xul:hbox>
           </xul:vbox>
         </xul:vbox>
@@ -387,7 +404,7 @@
 
     </binding>
 
-    <binding id="cal-navbtn" inherits="dir">
+    <binding id="minimonth-navbtn" inherits="dir">
         <!-- ::::::::::::::::: HANDLERS ::::::::::::::::::::::::: -->
         <handlers>
             <handler event="click">
@@ -398,7 +415,7 @@
         </handlers>
     </binding>
 
-    <binding id="cal-day" extends="xul:text">
+    <binding id="minimonth-day" extends="xul:text">
         <!-- ::::::::::::::::: HANDLERS ::::::::::::::::::::::::: -->
         <handlers>
             <handler event="click" action="this.calendar.dayClicked(this)"/>