Merge branch 'master' into test

Conflicts:
	buildout.cfg

diff --cc buildout.cfg
index d4e6a15,5aa5ad9..17b5623
--- 1/buildout.cfg
--- 2/buildout.cfg
+++ b/buildout.cfg
@@@ -9,14 -9,8 +9,13 @@@ find-links = http://pypi.auf.org/simple
      http://pypi.auf.org/simple/auf.django.workflow/
      http://pypi.auf.org/simple/auf.django.admingroup/
      http://pypi.auf.org/simple/auf.django.permissions/
- <<<<<<< HEAD
 +    http://pypi.auf.org/simple/auf.django.metadata/
 +    http://pypi.auf.org/simple/auf.django.emploi/
 +    http://pypi.auf.org/django-alphafilter/
-     http://pypi.aur.org/simple/auf.django.references/
+     http://pypi.auf.org/simple/auf.django.references/
  
 +develop = src/qbe
 +
  eggs =
      django
      south
@@@ -32,24 -25,13 +31,22 @@@
      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
  
- develop = ../auf_django_references
- 
  [versions]
  django-admin-tools = 0.4.0
 -django = 1.2.5
 +django = 1.3.1
  south = 0.7
  auf.django.auth = 0.5.5dev
 +auf.django.emploi = 0.6dev
 +auf.django.metadata = 0.3dev
  auf.django.permissions = 0.1
  auf.django.references = 0.4
  auf.django.skin = 0.17dev