Merge 2.8.8.1

------------------------------------------------------------
Use --include-merges or -n0 to see merged revisions.

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.timsu.astrid"
-      android:versionName="2.8.8" android:versionCode="115">
+      android:versionName="2.8.8.1" android:versionCode="116">
       
     <!-- ============================ Metadata ============================ -->   
       

src/com/timsu/astrid/sync/SynchronizationService.java

@@ -95,7 +95,8 @@ public class SynchronizationService extends BroadcastReceiver {
         am.cancel(pendingIntent);
 
         // schedule new
-        am.setInexactRepeating(AlarmManager.RTC, offset, interval, pendingIntent);
+        am.setInexactRepeating(AlarmManager.RTC, System.currentTimeMillis() + offset,
+                interval, pendingIntent);
     }
 
 
@@ -133,6 +134,7 @@ public class SynchronizationService extends BroadcastReceiver {
         long offset = 0;
         if(latestSyncMillis != 0)
             offset = Math.max(0, latestSyncMillis + interval - System.currentTimeMillis());
+
         return offset;
     }