Resolve conflicts between .NET/Java branches in basic-library.scm
Resolve conflicts between .NET/Java branches in basic-library.scm

darcs-hash:20050119231306-51b3b-fa60376cadabd5a4fddecf817a1e88b26fb2f4bf.gz

tonyg/newmoon,tonyg/newmoon,tonyg/newmoon