Patch by cls. r=bsmedberg sr=mscott git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@164689 18797224-902f-48f8-a5cc-f745e15eee43