Merge branch 'serialisation'

Conflicts:
	setup.py

src/zc/buildout/buildout.py

@@ -1550,6 +1550,9 @@ class Options(UserDict.DictMixin):
                 result[key] = loads(value)
         result.update(self._cooked)
         result.update(self._data)
+        for key, value in result.iteritems():
+            if value.startswith(SERIALISED_VALUE_MAGIC):
+                result[key] = loads(value)
         return result
 
     def _call(self, f):