[MERGE]

bzr revid: hmo@tinyerp.com-20100730065747-z6dngo0mtk7vh0ov

diff --combined addons/base_calendar/base_calendar.py
index 241a36b,1324c25..27b6800
--- 1/addons/base_calendar/base_calendar.py
--- 2/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@@ -1092,7 -1092,7 +1092,7 @@@ class calendar_event(osv.osv)
                          ('confirmed', 'Confirmed'),
                          ('cancelled', 'Cancelled')], 'State', readonly=True),
          'exdate': fields.text('Exception Date/Times', help="This property \
 -defines the list of date/time exceptions for arecurring calendar component."),
 +defines the list of date/time exceptions for a recurring calendar component."),
          'exrule': fields.char('Exception Rule', size=352, help="defines a \
  rule or repeating pattern for an exception to a recurrence set"),
          'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
@@@ -1500,6 -1500,7 +1500,7 @@@ true, it will allow you to hide the eve
          @param context: A standard dictionary for contextual values
          @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
          """
+         # FIXME This whole id mangling has to go!
          if not context:
              context = {}