Merge branch 'context_object'
Florian Ragwitz [Fri, 24 Oct 2008 21:17:24 +0000 (21:17 +0000)]

Trivial merge