merge master

diff --cc buildout.cfg
index 97f12f0,3079d83..a11dcad
--- 1/buildout.cfg
--- 2/buildout.cfg
+++ b/buildout.cfg
@@@ -21,51 -23,27 +23,28 @@@ eggs 
      django
      south
      django-admin-tools
+     django-ajax-selects
+     django-alphafilter
+     django-form-utils
+     django-qbe
+     django-reversion
+     django-sendfile
+     django-simple-captcha
      django-tinymce
-     auf.django.skin
-     auf.django.workflow
+     django-urldecorators
      auf.django.admingroup
-     auf.django.emploi
      auf.django.auth
+     auf.django.emploi
+     auf.django.metadata
      auf.django.permissions
      auf.django.references
-     auf.django.emploi
+     auf.django.skin
+     auf.django.workflow
      auf.recipe.django
-     django-reversion
-     simplejson
-     django-ajax-selects
-     django-form-utils
-     django-tinymce
-     django-simple-captcha
-     auf.django.metadata
-     django-alphafilter
-     django-sendfile
-     django-qbe
-     django-urldecorators
-     pygraphviz
      odfpy
 +    django-picklefield
- 
- [versions]
- django-admin-tools = 0.4.1
- django = 1.3.1
- south = 0.7
- auf.django.skin = 1.5
- auf.django.auth = 0.5.5dev
- auf.django.emploi = 1.0dev
- auf.django.metadata = 0.6dev
- auf.django.permissions = 0.1
- auf.django.references = 0.7
- auf.django.workflow = 0.15dev
- django-reversion = 1.3.3
- django-ajax-selects = 1.1.4
- django-alphafilter = 0.5.3auf4
- django-sendfile = 0.2.1
- django-alphafilter = 0.5.3auf4
- django-urldecorators = 0.3
- pygraphviz = 0.36
- odfpy = 0.9.4
- django-picklefield = 0.2.1
+     pygraphviz
+     simplejson
  
  [django]
  recipe = auf.recipe.django

diff --cc versions.cfg
index 0000000,35decf1..73013c0
mode 000000,100644..100644
--- /dev/null
--- 2/versions.cfg
+++ b/versions.cfg
@@@ -1,0 -1,55 +1,58 @@@
+ [versions]
+ django = 1.3.1
+ south = 0.7
+ django-admin-tools = 0.4.1
+ django-ajax-selects = 1.1.4
+ django-alphafilter = 0.5.3auf4
+ django-reversion = 1.3.3
+ django-sendfile = 0.2.1
+ django-urldecorators = 0.3
+ auf.django.auth = 0.5.5dev
+ auf.django.emploi = 1.0dev
+ auf.django.metadata = 0.6dev
+ auf.django.permissions = 0.1
+ auf.django.references = 0.7
+ auf.django.skin = 1.5
+ auf.django.workflow = 0.15dev
+ odfpy = 0.9.4
+ pygraphviz = 0.36
+ 
+ # Added by Buildout Versions at 2012-05-09 13:24:49.321297
+ auf.django.admingroup = 0.3dev
+ auf.recipe.django = 1.7
+ buildout-versions = 1.7
+ distribute = 0.6.15
+ django-debug-toolbar = 0.9.4
+ django-form-utils = 0.2.0
+ django-simple-captcha = 0.3.0
+ django-tinymce = 1.5.1b2
+ djangorecipe = 1.1.2
+ http-parser = 0.7.5
+ 
+ # Required by:
+ # auf.django.auth==0.5.5dev
+ datamaster-modeles = 0.1.14
+ 
+ # Required by:
+ # auf.django.emploi==1.0dev
+ poster = 0.8.1
+ 
+ # Required by:
+ # auf.recipe.django==1.5
+ # djangorecipe==1.1.2
+ zc.buildout = 1.5.2
+ 
+ # Required by:
+ # auf.recipe.django==1.5
+ # djangorecipe==1.1.2
+ zc.recipe.egg = 1.3.2
+ 
+ # Added by Buildout Versions at 2012-05-09 17:53:00.724143
+ simplejson = 2.5.0
+ 
+ # Required by:
+ # auf.django.emploi==1.0dev
+ httplib2 = 0.7.4
++
++# Added by Buildout Versions at 2012-05-30 13:39:28.023002
++django-picklefield = 0.2.1