Merge remote branch 'shadowcat/master'
Zachary Stevens [Sat, 19 Dec 2009 15:33:45 +0000 (15:33 +0000)]
Conflicts:
Changes


Trivial merge