bug 343027 - changes to bring trunk in sync with branch. r=jminta

calendar/sunbird/base/content/calendar.xul

@@ -44,8 +44,8 @@
 
 <!-- Style sheets -->
 
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/datetimepickers/minimonth.css" type="text/css"?>
 

calendar/sunbird/themes/pinstripe/sunbird/jar.mn

@@ -9,7 +9,6 @@ calendar.jar:
    skin/classic/calendar/datetimepickers/right-arrow.png            (datetimepickers/right-arrow.png)
    skin/classic/calendar/datetimepickers/right-arrow-hover.png      (datetimepickers/right-arrow.png)
 +  skin/classic/calendar/datetimepickers/minimonth.css              (datetimepickers/minimonth.css)
-
 classic.jar:
    icon.png
    preview.png