--- a/server/msplanner.py	Fri Jun 26 11:31:57 2009 +0200
+++ b/server/msplanner.py	Fri Jun 26 23:37:09 2009 +0200
@@ -563,7 +563,9 @@
                 self._sourcesterms = {self.system_source: {}}
         elif not self.needsplit:
             if not allequals(self._sourcesterms.itervalues()):
-                for terms in self._sourcesterms.itervalues():
+                for source, terms in self._sourcesterms.iteritems():
+                    if source is self.system_source:
+                        continue
                     if any(x for x in terms if not isinstance(x, Constant)):
                         self.needsplit = True
                         return