Merge branch 'corelist-deprecated' into blead
David Golden [Tue, 20 Oct 2009 01:36:50 +0000 (21:36 -0400)]

Trivial merge