Merge branch 'master' of git://github.com/bobtfish/Gitalist
Zachary Stevens [Sun, 29 Nov 2009 18:29:20 +0000 (18:29 +0000)]

Trivial merge