Commit c6b139ddc9a20f2b88e2e49168f90897851c28a3

Dale Campbell
Wed Dec 10 08:05:10 CET 2008

Tree SHA1: 9b97a0e
Parent SHA1: 0beed24 (more whitespace cleanups)
Parent SHA1: 32d3acd (updated stylesheet)

Merge commit 'matt/master'