[Laszlo-checkins] r5800 - sandbox/ben/branches/cuppajoe

[ben@openlaszlo.org]

Author: ben
Date: 2007-07-25 21:58:49 -0700 (Wed, 25 Jul 2007)
New Revision: 5800

Modified:
   sandbox/ben/branches/cuppajoe/README.txt
Log:
making an experimental change to test svnmerge

Modified: sandbox/ben/branches/cuppajoe/README.txt
===================================================================
--- sandbox/ben/branches/cuppajoe/README.txt	2007-07-26 04:50:03 UTC (rev 5799)
+++ sandbox/ben/branches/cuppajoe/README.txt	2007-07-26 04:58:49 UTC (rev 5800)
@@ -1,5 +1,8 @@
 LPS @VERSIONID@ README
 
+Here is a lovely edit made by ben in the cuppajoe branch. We would like 
+to see this change turn up in the cuppatea branch eventually. 
+
 Here's what you'll find:
 
     LICENSE.txt           - The End User License Agreement for the LPS.