Merge change Ic7edd6ea into eclair

* changes:
  Cancel the snooze if the user sets an alarm for before the snooze fires.