Bug fix in the molecule.display() user function.
The test for None or a str should use 'and', not 'or'!
Authored by: bugman 2007-11-20
Parent: [r3645]
Child: [r3647]
