If the porter had used the vim colorizer he'd have noticed the missing ( ;)
Minor pythonic change.
Merging has gone awry, delete the branch in preperation for recreating it.
jpaetzel magic to make auto-creation of home directories on wind0rz work.
Automerging change r9947 from trunk to branches/8.2.0 ------------------------------------------------------------------------ r9947 | delphij | 2012-01-31 15:44:06 -0800 (Tue, 31 Jan 2012) | 2 lines
Import widgets from dojango.
Automerging change r9946 from trunk to branches/8.2.0 ------------------------------------------------------------------------ r9946 | delphij | 2012-01-31 15:39:57 -0800 (Tue, 31 Jan 2012) | 2 lines
Fix a typo.
Automerging change r9945 from trunk to branches/8.2.0 ------------------------------------------------------------------------ r9945 | delphij | 2012-01-31 15:14:15 -0800 (Tue, 31 Jan 2012) | 2 lines
Attempt to break a circular dependency.
Automerging change r9944 from trunk to branches/8.2.0 ------------------------------------------------------------------------ r9944 | jhixson | 2012-01-31 14:40:50 -0800 (Tue, 31 Jan 2012) | 3 lines
Don't need these imports any more.
