Merge branch 'tidy-project'
Zachary Stevens [Sat, 14 Nov 2009 02:38:43 +0000 (02:38 +0000)]

Trivial merge