old_contents: """stick the various versioning attributes in here, so we only have to change
  them once."""
  version = '0.83.4.1+limnoria (2011-12-06T17:14:28+0100)'
  
new_contents: """stick the various versioning attributes in here, so we only have to change
  them once."""
  version = '0.83.4.1+limnoria (2011-12-06T17:42:04+0100)'
  
subject: Fix previous merge (again).