From b56d54b1015793685c601b080c10fb42edf56166 Mon Sep 17 00:00:00 2001
From: "George V. Reilly" <george@reilly.org>
Date: Thu, 22 Dec 2011 00:09:23 -0800
Subject: [PATCH] Merged fixes from kjoconnor.

---
 src/icalendar/cal.py  | 2 +-
 src/icalendar/prop.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/icalendar/cal.py b/src/icalendar/cal.py
index d7bf5f7..2890dc4 100644
--- a/src/icalendar/cal.py
+++ b/src/icalendar/cal.py
@@ -578,7 +578,7 @@ class Calendar(Component):
     """
 
     name = 'VCALENDAR'
-    canonical_order = ('PRODID', 'VERSION', 'CALSCALE', 'METHOD',)
+    canonical_order = ('VERSION', 'PRODID', 'CALSCALE', 'METHOD',)
     required = ('prodid', 'version', )
     singletons = ('prodid', 'version', )
     multiple = ('calscale', 'method', )
diff --git a/src/icalendar/prop.py b/src/icalendar/prop.py
index 052b0c6..6ce4f1f 100644
--- a/src/icalendar/prop.py
+++ b/src/icalendar/prop.py
@@ -1449,7 +1449,7 @@ class TypesFactory(CaselessDict):
     # These are the default types
     types_map = CaselessDict({
         ####################################
-        # Property valye types
+        # Property value types
         # Calendar Properties
         'calscale' : 'text',
         'method' : 'text',