Merge branch 'blockcontainer' of github.com:melinath/philo into blockcontainer

diff --cc templatetags/containers.py
index ac43256,c04cb64..490b56b
--- 1/templatetags/containers.py
--- 2/templatetags/containers.py
+++ b/templatetags/containers.py
@@@ -119,5 -119,4 +119,5 @@@ def do_container(parser, token)
                
        else: # error
                raise template.TemplateSyntaxError('"%s" template tag provided without arguments (at least one required)' % tag)
 -register.tag('container', do_container)
 +register.tag('container', do_container)
- register.tag('blockcontainer', do_container)
++register.tag('blockcontainer', do_container)