Nicolas Cellier uploaded a new version of Traits to project The Trunk:
http://source.squeak.org/trunk/Traits-nice.277.mcz

==================== Summary ====================

Name: Traits-nice.277
Author: nice
Time: 3 January 2010, 5:09:11 am
UUID: b41950de-85d2-478d-a512-6e2a1e9a7795
Ancestors: Traits-ul.276

remove some #or:or: #and:and: sends

=============== Diff against Traits-ul.276 ===============

Item was changed:
  ----- Method: Trait>>isValidTraitName: (in category 'initialize') -----
  isValidTraitName: aSymbol
  	^(aSymbol isEmptyOrNil
+ 		or: [aSymbol first isLetter not
+ 		or: [aSymbol anySatisfy: [:character | character isAlphaNumeric not]]]) not!
- 		or: [aSymbol first isLetter not]
- 		or: [aSymbol anySatisfy: [:character | character isAlphaNumeric not]]) not!

Item was changed:
  ----- Method: Trait>>classDefinitions (in category 'monticello') -----
  classDefinitions
  	| definitions |
  	definitions := OrderedCollection with: self asClassDefinition.
  	(self hasClassTrait
+ 		and: [self classTrait hasTraitComposition
+ 		and: [self classTrait traitComposition isEmpty not]])
- 		and: [self classTrait hasTraitComposition]
- 		and: [self classTrait traitComposition isEmpty not])
  			ifTrue: [definitions add: self classTrait asMCDefinition].
  	^definitions asArray!

Item was changed:
  ----- Method: ClassDescription>>isAliasSelector: (in category '*Traits-NanoKernel') -----
  isAliasSelector: aSymbol
  	"Return true if the selector aSymbol is an alias defined
  	in my or in another composition somewhere deeper in 
  	the tree of traits compositions."
  
  	^(self includesLocalSelector: aSymbol) not
+ 		and: [self hasTraitComposition
+ 		and: [self traitComposition isAliasSelector: aSymbol]]!
- 		and: [self hasTraitComposition]
- 		and: [self traitComposition isAliasSelector: aSymbol]!

Item was changed:
  ----- Method: ClassDescription>>isLocalAliasSelector: (in category '*Traits-NanoKernel') -----
  isLocalAliasSelector: aSymbol
  	"Return true if the selector aSymbol is an alias defined
  	in my or in another composition somewhere deeper in 
  	the tree of traits compositions."
  
  	^(self includesLocalSelector: aSymbol) not
+ 		and: [self hasTraitComposition
+ 		and: [self traitComposition isLocalAliasSelector: aSymbol]]!
- 		and: [self hasTraitComposition]
- 		and: [self traitComposition isLocalAliasSelector: aSymbol]!