K 10 svn:author V 5 simon K 8 svn:date V 27 2005-10-04T21:31:49.000000Z K 7 svn:log V 129 MFP4: Merge more of the new layout. Submitted by: Emily Boyd Sponsored by: Google Summer of Code 2005 END