Index: /pyyaml/trunk/lib/yaml/__init__.py
===================================================================
--- /pyyaml/trunk/lib/yaml/__init__.py	(revision 282)
+++ /pyyaml/trunk/lib/yaml/__init__.py	(revision 295)
@@ -13,7 +13,7 @@
 try:
     from cyaml import *
-    __libyaml__ = True
+    __with_libyaml__ = True
 except ImportError:
-    __libyaml__ = False
+    __with_libyaml__ = False
 
 def scan(stream, Loader=Loader):
Index: /pyyaml/trunk/setup.py
===================================================================
--- /pyyaml/trunk/setup.py	(revision 294)
+++ /pyyaml/trunk/setup.py	(revision 295)
@@ -257,5 +257,5 @@
         cmdclass={
             'build_ext': build_ext,
-            'test': test,
+#            'test': test,
         },
     )
Index: /pyyaml/trunk/MANIFEST.in
===================================================================
--- /pyyaml/trunk/MANIFEST.in	(revision 290)
+++ /pyyaml/trunk/MANIFEST.in	(revision 295)
@@ -1,4 +1,4 @@
 include README LICENSE setup.py
 recursive-include examples *.py *.cfg *.yaml
-recursive-include tests *.py
-recursive-include tests/data *
+#recursive-include tests *.py
+#recursive-include tests/data *
Index: /pyyaml/trunk/Makefile
===================================================================
--- /pyyaml/trunk/Makefile	(revision 285)
+++ /pyyaml/trunk/Makefile	(revision 295)
@@ -18,8 +18,8 @@
 	${PYTHON} setup.py --with-libyaml build -f ${PARAMETERS}
 
-install: build
+install:
 	${PYTHON} setup.py install ${PARAMETERS}
 
-installext: buildext
+installext:
 	${PYTHON} setup.py --with-libyaml install ${PARAMETERS}
 
@@ -30,5 +30,5 @@
 	${PYTHON} tests/test_build_ext.py ${TEST}
 
-dist: buildext
+dist:
 	${PYTHON} setup.py --with-libyaml sdist --formats=zip,gztar
 
Index: /pyyaml/trunk/README
===================================================================
--- /pyyaml/trunk/README	(revision 279)
+++ /pyyaml/trunk/README	(revision 295)
@@ -3,7 +3,13 @@
 To install, type 'python setup.py install'.
 
-To build and install PyYAML with LibYAML bindings, type
-'python setup.py --with-libyaml install'.
-Then you may use a fast LibYAML-based parser and emitter as follows:
+By default, the setup.py script checks whether LibYAML is installed
+and if so, builds and installs LibYAML bindings.  To skip the check
+and force installation of LibYAML bindings, add the option '--with-libyaml':
+'python setup.py --with-libyaml install'.  To disable the check and
+skip building and installing LibYAML bindings, use '--without-libyaml':
+'python setup.py --without-libyaml install'.
+
+When LibYAML bindings are installed, you may use a fast LibYAML-based
+parser and emitter as follows:
 
     >>> yaml.load(stream, Loader=yaml.CLoader)
Index: /pyyaml/trunk/announcement.msg
===================================================================
--- /pyyaml/trunk/announcement.msg	(revision 290)
+++ /pyyaml/trunk/announcement.msg	(revision 295)
@@ -15,14 +15,16 @@
 =======
 
-* Fixed a dot '.' character being recognized as !!float.
-* Fixed exceptions produced by LibYAML bindings.
+* setup.py checks whether LibYAML is installed and if so, builds
+  and installs LibYAML bindings.  To force or disable installation
+  of LibYAML bindings, use '--with-libyaml' or '--without-libyaml'
+  respectively.
+* Building LibYAML bindings no longer requires Pyrex installed.
 * 'yaml.load()' raises an exception if the input stream contains
   more than one YAML document.
-* Improved compatibility with Python 2.3.
-* Use setuptools for setup.py.  If you want to build optional LibYAML
-  bindings, run 'python setup.py --with-libyaml install'.  Building
-  LibYAML bindings no longer requires PyRex installed.
+* Fixed exceptions produced by LibYAML bindings.
+* Fixed a dot '.' character being recognized as !!float.
+* Fixed Python 2.3 compatibility issue in constructing !!timestamp values.
 * Windows binary packages are built against the LibYAML stable branch.
-* Added an attribute 'yaml.__version__' and a flag 'yaml.__libyaml__'.
+* Added attributes 'yaml.__version__' and  'yaml.__with_libyaml__'.