Wed, 02 Mar 2011 09:41:26 +0100 7023323: Build failure on VS2003: IsDebuggerPresent not found
sla [Wed, 02 Mar 2011 09:41:26 +0100] rev 8480
7023323: Build failure on VS2003: IsDebuggerPresent not found Summary: #define _WIN32_WINNT 0x500 Reviewed-by: ohrstrom, hosterda, coleenp
Mon, 28 Feb 2011 22:35:01 -0800 Merge
rottenha [Mon, 28 Feb 2011 22:35:01 -0800] rev 8479
Merge
Mon, 28 Feb 2011 15:35:45 -0800 Merge
rottenha [Mon, 28 Feb 2011 15:35:45 -0800] rev 8478
Merge
Mon, 28 Feb 2011 16:01:59 -0500 7020118: Alter frame assignability to allow for exception handler coverage of invokespecial <init>
kamg [Mon, 28 Feb 2011 16:01:59 -0500] rev 8477
7020118: Alter frame assignability to allow for exception handler coverage of invokespecial <init> Summary: Add special rule to allow assignment of frames with uninit flags set. Reviewed-by: never, coleenp
Mon, 28 Feb 2011 14:19:52 +0100 7022037: Pause when exiting if debugger is attached on windows
sla [Mon, 28 Feb 2011 14:19:52 +0100] rev 8476
7022037: Pause when exiting if debugger is attached on windows Reviewed-by: dsamersoff, kamg, hosterda
Sat, 26 Feb 2011 13:33:23 -0500 7017640: Fix for 6766644 deadlocks on some NSK tests when running with -Xcomp
kamg [Sat, 26 Feb 2011 13:33:23 -0500] rev 8475
7017640: Fix for 6766644 deadlocks on some NSK tests when running with -Xcomp Summary: Dynamic-code generated events should be deferred and processed by service thread Reviewed-by: dsamersoff, dcubed
Thu, 10 Mar 2011 17:10:55 -0800 Added tag jdk7-b133 for changeset d7dd3e46bc54
cl [Thu, 10 Mar 2011 17:10:55 -0800] rev 8474
Added tag jdk7-b133 for changeset d7dd3e46bc54
Thu, 10 Mar 2011 17:10:45 -0800 Added tag jdk7-b133 for changeset 309991ddb9a1
cl [Thu, 10 Mar 2011 17:10:45 -0800] rev 8473
Added tag jdk7-b133 for changeset 309991ddb9a1
Wed, 05 Jul 2017 17:37:02 +0200 Added tag jdk7-b133 for changeset fd444c61e7ed
duke [Wed, 05 Jul 2017 17:37:02 +0200] rev 8472
Added tag jdk7-b133 for changeset fd444c61e7ed
Wed, 05 Jul 2017 17:37:01 +0200 Merge jdk7-b133
duke [Wed, 05 Jul 2017 17:37:01 +0200] rev 8471
Merge
Wed, 05 Jul 2017 17:36:59 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:59 +0200] rev 8470
Merge
Thu, 03 Mar 2011 14:13:21 -0800 Added tag jdk7-b132 for changeset 83cbfe0a919f
katleman [Thu, 03 Mar 2011 14:13:21 -0800] rev 8469
Added tag jdk7-b132 for changeset 83cbfe0a919f
Wed, 05 Jul 2017 17:36:56 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:56 +0200] rev 8468
Merge
Thu, 03 Mar 2011 14:13:05 -0800 Added tag jdk7-b132 for changeset d5d7b14cb04c
katleman [Thu, 03 Mar 2011 14:13:05 -0800] rev 8467
Added tag jdk7-b132 for changeset d5d7b14cb04c
Wed, 05 Jul 2017 17:36:54 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:54 +0200] rev 8466
Merge
Thu, 03 Mar 2011 14:13:04 -0800 Added tag jdk7-b132 for changeset 3ea23e6be269
katleman [Thu, 03 Mar 2011 14:13:04 -0800] rev 8465
Added tag jdk7-b132 for changeset 3ea23e6be269
Wed, 05 Jul 2017 17:36:51 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:51 +0200] rev 8464
Merge
Thu, 03 Mar 2011 14:12:54 -0800 Added tag jdk7-b132 for changeset 2779d6e22651
katleman [Thu, 03 Mar 2011 14:12:54 -0800] rev 8463
Added tag jdk7-b132 for changeset 2779d6e22651
Wed, 05 Jul 2017 17:36:49 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:49 +0200] rev 8462
Merge
Tue, 08 Mar 2011 16:05:16 -0800 Merge
ohair [Tue, 08 Mar 2011 16:05:16 -0800] rev 8461
Merge
Thu, 03 Mar 2011 15:30:36 -0800 Merge
ohair [Thu, 03 Mar 2011 15:30:36 -0800] rev 8460
Merge
Thu, 03 Mar 2011 07:02:30 -0800 Merge
ohair [Thu, 03 Mar 2011 07:02:30 -0800] rev 8459
Merge
Wed, 02 Mar 2011 13:18:36 -0800 7020815: REBASE should not be required for windows jdk repo builds - can't build with VS 2010 Express
ohair [Wed, 02 Mar 2011 13:18:36 -0800] rev 8458
7020815: REBASE should not be required for windows jdk repo builds - can't build with VS 2010 Express Reviewed-by: prr
Wed, 02 Mar 2011 12:09:26 -0800 Merge
ohair [Wed, 02 Mar 2011 12:09:26 -0800] rev 8457
Merge
Mon, 28 Feb 2011 10:56:20 +0100 7021753: Add a build times report
ohrstrom [Mon, 28 Feb 2011 10:56:20 +0100] rev 8456
7021753: Add a build times report Summary: Report the build times at end of a jdkroot build. Reviewed-by: ohair
Sat, 26 Feb 2011 12:42:48 -0800 Merge
ohair [Sat, 26 Feb 2011 12:42:48 -0800] rev 8455
Merge
Sat, 26 Feb 2011 12:11:32 -0800 7022237: Fix use of \" in the new "release" file at the top of the install, windows issues
ohair [Sat, 26 Feb 2011 12:11:32 -0800] rev 8454
7022237: Fix use of \" in the new "release" file at the top of the install, windows issues Reviewed-by: ohrstrom
Sat, 26 Feb 2011 10:12:24 -0800 Merge
ohair [Sat, 26 Feb 2011 10:12:24 -0800] rev 8453
Merge
Sat, 26 Feb 2011 09:45:47 -0800 7016175: HTML generated from new JavaDoc has tags added from makefile
ohair [Sat, 26 Feb 2011 09:45:47 -0800] rev 8452
7016175: HTML generated from new JavaDoc has tags added from makefile Reviewed-by: jjg
Tue, 08 Mar 2011 14:26:17 -0800 Merge
igor [Tue, 08 Mar 2011 14:26:17 -0800] rev 8451
Merge
Tue, 01 Mar 2011 17:09:16 -0500 7021567: need to create jnlp javadoc for 64 bit bundles.
herrick [Tue, 01 Mar 2011 17:09:16 -0500] rev 8450
7021567: need to create jnlp javadoc for 64 bit bundles. Summary: need to create jnlp javadoc for 64 bit bundles. Reviewed-by: igor, ohair
Thu, 03 Mar 2011 14:13:10 -0800 Added tag jdk7-b132 for changeset 6f39c4c0f737
katleman [Thu, 03 Mar 2011 14:13:10 -0800] rev 8449
Added tag jdk7-b132 for changeset 6f39c4c0f737
Wed, 05 Jul 2017 17:36:43 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:43 +0200] rev 8448
Merge
Thu, 03 Mar 2011 15:13:18 -0800 Added tag hs21-b03 for changeset 36d51765affc
trims [Thu, 03 Mar 2011 15:13:18 -0800] rev 8447
Added tag hs21-b03 for changeset 36d51765affc
Thu, 03 Mar 2011 14:12:59 -0800 Added tag jdk7-b132 for changeset 802ca1911963
katleman [Thu, 03 Mar 2011 14:12:59 -0800] rev 8446
Added tag jdk7-b132 for changeset 802ca1911963
Wed, 09 Mar 2011 16:26:38 -0800 7026167: Broken fastdebug only build
ohair [Wed, 09 Mar 2011 16:26:38 -0800] rev 8445
7026167: Broken fastdebug only build Reviewed-by: cl
Thu, 03 Mar 2011 15:29:24 -0800 Merge
ohair [Thu, 03 Mar 2011 15:29:24 -0800] rev 8444
Merge
Tue, 01 Mar 2011 11:54:35 -0800 Merge
ohair [Tue, 01 Mar 2011 11:54:35 -0800] rev 8443
Merge
Tue, 01 Mar 2011 11:54:05 -0800 7023111: Add webrev script to make/scripts
ohair [Tue, 01 Mar 2011 11:54:05 -0800] rev 8442
7023111: Add webrev script to make/scripts Reviewed-by: darcy
Mon, 28 Feb 2011 10:56:10 +0100 7021753: Add a build times report
ohrstrom [Mon, 28 Feb 2011 10:56:10 +0100] rev 8441
7021753: Add a build times report Summary: Report the build times at end of a jdkroot build. Reviewed-by: ohair
Thu, 03 Mar 2011 14:12:53 -0800 Added tag jdk7-b132 for changeset 3de4870f376a
katleman [Thu, 03 Mar 2011 14:12:53 -0800] rev 8440
Added tag jdk7-b132 for changeset 3de4870f376a
Wed, 05 Jul 2017 17:36:34 +0200 Added tag jdk7-b132 for changeset d61280d36755
duke [Wed, 05 Jul 2017 17:36:34 +0200] rev 8439
Added tag jdk7-b132 for changeset d61280d36755
Wed, 05 Jul 2017 17:36:33 +0200 Merge jdk7-b132
duke [Wed, 05 Jul 2017 17:36:33 +0200] rev 8438
Merge
Wed, 05 Jul 2017 17:36:30 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:30 +0200] rev 8437
Merge
Thu, 24 Feb 2011 18:05:10 -0800 Merge
lana [Thu, 24 Feb 2011 18:05:10 -0800] rev 8436
Merge
Mon, 21 Feb 2011 14:35:12 -0800 Merge
lana [Mon, 21 Feb 2011 14:35:12 -0800] rev 8435
Merge
Fri, 18 Feb 2011 15:55:20 -0800 7020047: Project Coin: generate null-check around try-with-resources close call
darcy [Fri, 18 Feb 2011 15:55:20 -0800] rev 8434
7020047: Project Coin: generate null-check around try-with-resources close call Reviewed-by: jjg
Fri, 18 Feb 2011 16:17:44 +0000 7020626: diamond: add diagnostic test for diamond and non-generic classes
mcimadamore [Fri, 18 Feb 2011 16:17:44 +0000] rev 8433
7020626: diamond: add diagnostic test for diamond and non-generic classes Summary: Fix failure in regression test CheckExamples Reviewed-by: jjg
Fri, 18 Feb 2011 08:12:06 -0800 7018859: javac turn off the Zip optimization by default
ksrini [Fri, 18 Feb 2011 08:12:06 -0800] rev 8432
7018859: javac turn off the Zip optimization by default Reviewed-by: jjg
Fri, 18 Feb 2011 12:28:49 +0000 7020043: Project Coin: diamond allowed on non-generic type
mcimadamore [Fri, 18 Feb 2011 12:28:49 +0000] rev 8431
7020043: Project Coin: diamond allowed on non-generic type Summary: Diamond oerator should be disallowed on non-generic class types (i.e. String) Reviewed-by: jjg
Wed, 16 Feb 2011 10:27:00 -0800 6990136: Cleanup use of Type.clone()
dlsmith [Wed, 16 Feb 2011 10:27:00 -0800] rev 8430
6990136: Cleanup use of Type.clone() Summary: Introduced factory methods in class Types which can be used rather than clone(). Reviewed-by: jjg, mcimadamore
Tue, 15 Feb 2011 08:35:05 -0800 Merge
lana [Tue, 15 Feb 2011 08:35:05 -0800] rev 8429
Merge
Tue, 15 Feb 2011 11:51:04 +0000 7017104: improve error reporting for uncaught/undeclared exceptions from try-with-resources
mcimadamore [Tue, 15 Feb 2011 11:51:04 +0000] rev 8428
7017104: improve error reporting for uncaught/undeclared exceptions from try-with-resources Summary: twr should generate better error message when uncaught exceptions are thrown by implicit call of close() method Reviewed-by: jjg
Tue, 15 Feb 2011 11:49:46 +0000 7017664: Add listeners infrastracture to javac scopes
mcimadamore [Tue, 15 Feb 2011 11:49:46 +0000] rev 8427
7017664: Add listeners infrastracture to javac scopes Summary: Add listeners to javac scopes, added CompoundScope and correct invalidation logic for ImplementationCache Reviewed-by: jjg
Mon, 14 Feb 2011 14:27:47 -0800 7008433: Minor copyright changes
jjg [Mon, 14 Feb 2011 14:27:47 -0800] rev 8426
7008433: Minor copyright changes Reviewed-by: jjg Contributed-by: kelly.ohair@oracle.com
Fri, 11 Feb 2011 17:10:26 -0800 6505047: javax.lang.model.element.Element.getEnclosingElement() doesn't return null for type parameter
jjg [Fri, 11 Feb 2011 17:10:26 -0800] rev 8425
6505047: javax.lang.model.element.Element.getEnclosingElement() doesn't return null for type parameter Reviewed-by: darcy
Thu, 10 Feb 2011 15:05:33 -0800 6485027: javac incorrectly handles relative paths in manifest classpath
jjg [Thu, 10 Feb 2011 15:05:33 -0800] rev 8424
6485027: javac incorrectly handles relative paths in manifest classpath Reviewed-by: mcimadamore
Thu, 10 Feb 2011 14:27:34 -0800 7018452: langtools not buildable on Mac
jjg [Thu, 10 Feb 2011 14:27:34 -0800] rev 8423
7018452: langtools not buildable on Mac Reviewed-by: ohair
Thu, 10 Feb 2011 14:24:26 -0800 7018098: CacheFSInfo persists too long
jjg [Thu, 10 Feb 2011 14:24:26 -0800] rev 8422
7018098: CacheFSInfo persists too long Reviewed-by: mcimadamore
Wed, 09 Feb 2011 18:26:08 -0800 7018447: langtools launcher template fails if tools run from their own directory
jjg [Wed, 09 Feb 2011 18:26:08 -0800] rev 8421
7018447: langtools launcher template fails if tools run from their own directory Reviewed-by: jjg Contributed-by: daniel.smith@oracle.com
Wed, 09 Feb 2011 14:10:52 -0800 7010792: remove bad debugging method from javac
jjg [Wed, 09 Feb 2011 14:10:52 -0800] rev 8420
7010792: remove bad debugging method from javac Reviewed-by: mcimadamore
Wed, 09 Feb 2011 14:04:53 -0800 7016750: tools/javac/nio/CompileTest failing in nightly test
jjg [Wed, 09 Feb 2011 14:04:53 -0800] rev 8419
7016750: tools/javac/nio/CompileTest failing in nightly test Reviewed-by: mcimadamore
Thu, 24 Feb 2011 15:16:13 -0800 Added tag jdk7-b131 for changeset 4de608132976
cl [Thu, 24 Feb 2011 15:16:13 -0800] rev 8418
Added tag jdk7-b131 for changeset 4de608132976
Wed, 05 Jul 2017 17:36:25 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:25 +0200] rev 8417
Merge
Thu, 24 Feb 2011 15:15:56 -0800 Added tag jdk7-b131 for changeset a13a950d71df
cl [Thu, 24 Feb 2011 15:15:56 -0800] rev 8416
Added tag jdk7-b131 for changeset a13a950d71df
Wed, 05 Jul 2017 17:36:22 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:22 +0200] rev 8415
Merge
Thu, 24 Feb 2011 15:15:56 -0800 Added tag jdk7-b131 for changeset df8969303f96
cl [Thu, 24 Feb 2011 15:15:56 -0800] rev 8414
Added tag jdk7-b131 for changeset df8969303f96
Wed, 05 Jul 2017 17:36:19 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:19 +0200] rev 8413
Merge
Thu, 24 Feb 2011 15:15:46 -0800 Added tag jdk7-b131 for changeset 590b6cc6f974
cl [Thu, 24 Feb 2011 15:15:46 -0800] rev 8412
Added tag jdk7-b131 for changeset 590b6cc6f974
Wed, 05 Jul 2017 17:36:17 +0200 Merge
duke [Wed, 05 Jul 2017 17:36:17 +0200] rev 8411
Merge
Tue, 01 Mar 2011 14:04:59 -0800 Merge
lana [Tue, 01 Mar 2011 14:04:59 -0800] rev 8410
Merge
Thu, 24 Feb 2011 18:04:19 -0800 Merge
lana [Thu, 24 Feb 2011 18:04:19 -0800] rev 8409
Merge
Thu, 24 Feb 2011 15:00:50 -0800 7022228: JPRT failure: RuntimeException in SupportedMedia regression test
jgodinez [Thu, 24 Feb 2011 15:00:50 -0800] rev 8408
7022228: JPRT failure: RuntimeException in SupportedMedia regression test Reviewed-by: igor, prr
Mon, 21 Feb 2011 14:33:58 -0800 Merge
lana [Mon, 21 Feb 2011 14:33:58 -0800] rev 8407
Merge
Mon, 21 Feb 2011 13:37:22 -0800 7001685: Renable EnumSetBash Test
mduigou [Mon, 21 Feb 2011 13:37:22 -0800] rev 8406
7001685: Renable EnumSetBash Test Reviewed-by: alanb, ohair, darcy
Fri, 18 Feb 2011 12:43:14 -0800 7018385: update javax.sql classes to use try-with-resources
smarks [Fri, 18 Feb 2011 12:43:14 -0800] rev 8405
7018385: update javax.sql classes to use try-with-resources Reviewed-by: alanb, lancea, darcy
Fri, 18 Feb 2011 12:07:46 +0530 7018459: javax.script code comments have issues with HTML4 validation and Accessibility compliance
sundar [Fri, 18 Feb 2011 12:07:46 +0530] rev 8404
7018459: javax.script code comments have issues with HTML4 validation and Accessibility compliance Reviewed-by: jjh
Thu, 17 Feb 2011 20:53:26 +0000 Merge
alanb [Thu, 17 Feb 2011 20:53:26 +0000] rev 8403
Merge
Thu, 17 Feb 2011 20:50:22 +0000 6526860: (fc) FileChannel.position returns 0 when FileOutputStream opened in append mode
alanb [Thu, 17 Feb 2011 20:50:22 +0000] rev 8402
6526860: (fc) FileChannel.position returns 0 when FileOutputStream opened in append mode Reviewed-by: forax
Thu, 17 Feb 2011 09:56:38 +0000 7017901: OOME in java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java
chegar [Thu, 17 Feb 2011 09:56:38 +0000] rev 8401
7017901: OOME in java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java Summary: Unbounded queues should be disabled in the test Reviewed-by: alanb
Wed, 16 Feb 2011 18:22:52 -0800 7018392: update URLJarFile.java to use try-with-resources
smarks [Wed, 16 Feb 2011 18:22:52 -0800] rev 8400
7018392: update URLJarFile.java to use try-with-resources Reviewed-by: alanb, chegar, hawtin
Wed, 16 Feb 2011 11:11:31 -0800 6999337: java.exe fails to start if some directory names in path to java binaries contain Russian characters
sherman [Wed, 16 Feb 2011 11:11:31 -0800] rev 8399
6999337: java.exe fails to start if some directory names in path to java binaries contain Russian characters Summary: updated to make sure the system properties are accessable by vm during initialization Reviewed-by: alanb, mchung
Wed, 16 Feb 2011 12:38:13 +0000 6562203: Thread doesn't terminate immediately if it was stopped before start
chegar [Wed, 16 Feb 2011 12:38:13 +0000] rev 8398
6562203: Thread doesn't terminate immediately if it was stopped before start Reviewed-by: dholmes, alanb
Tue, 15 Feb 2011 08:34:33 -0800 Merge
lana [Tue, 15 Feb 2011 08:34:33 -0800] rev 8397
Merge
Tue, 15 Feb 2011 12:11:15 +0800 7018928: test failure: sun/security/krb5/auto/SSL.java
weijun [Tue, 15 Feb 2011 12:11:15 +0800] rev 8396
7018928: test failure: sun/security/krb5/auto/SSL.java Reviewed-by: valeriep
Mon, 14 Feb 2011 13:31:13 -0800 7018897: CertPath validation cannot handle self-signed cert with bad KeyUsage
xuelei [Mon, 14 Feb 2011 13:31:13 -0800] rev 8395
7018897: CertPath validation cannot handle self-signed cert with bad KeyUsage Summary: Remove KeyUsage checking for trust anchors Reviewed-by: mullan
Mon, 14 Feb 2011 11:00:02 -0800 6927486: Hashtable writeObject() may deadlock
mduigou [Mon, 14 Feb 2011 11:00:02 -0800] rev 8394
6927486: Hashtable writeObject() may deadlock Summary: Do not synchronize on self while writing hash table elements Reviewed-by: alanb, mduigou Contributed-by: Neil Richards <neil.richards@ngmr.net>
Mon, 14 Feb 2011 10:48:46 -0800 Merge
mduigou [Mon, 14 Feb 2011 10:48:46 -0800] rev 8393
Merge
Mon, 14 Feb 2011 10:38:51 -0800 6934356: Vector.writeObject() serialization may deadlock
mduigou [Mon, 14 Feb 2011 10:38:51 -0800] rev 8392
6934356: Vector.writeObject() serialization may deadlock Summary: No longer synchronize on self while writing other objects. Reviewed-by: alanb, forax, mduigou, peterjones Contributed-by: Neil Richards <neil.richards@ngmr.net>
Mon, 14 Feb 2011 18:30:53 +0000 7016704: TEST_BUG: java/nio/file/Files/walk_file_tree.sh fails with new version of find (lnx)
alanb [Mon, 14 Feb 2011 18:30:53 +0000] rev 8391
7016704: TEST_BUG: java/nio/file/Files/walk_file_tree.sh fails with new version of find (lnx) Reviewed-by: forax
Mon, 14 Feb 2011 09:31:58 -0800 6637230: 2/3 jps doesn't work for application waiting for direct attach
dcubed [Mon, 14 Feb 2011 09:31:58 -0800] rev 8390
6637230: 2/3 jps doesn't work for application waiting for direct attach Summary: Properly handle exceptions thrown when querying a monitored VM. Reviewed-by: dsamersoff, swamyv
Fri, 11 Feb 2011 17:09:35 -0800 6996192: Console.readPassword race: input echo off must be prior to writing prompt
sherman [Fri, 11 Feb 2011 17:09:35 -0800] rev 8389
6996192: Console.readPassword race: input echo off must be prior to writing prompt Summary: To turn off echo before prompt Reviewed-by: alanb
Sat, 12 Feb 2011 07:30:01 +0800 7016698: test sun/security/krb5/runNameEquals.sh failed on Ubuntu
weijun [Sat, 12 Feb 2011 07:30:01 +0800] rev 8388
7016698: test sun/security/krb5/runNameEquals.sh failed on Ubuntu Reviewed-by: valeriep
Sat, 12 Feb 2011 05:09:36 +0800 6742654: Code insertion/replacement attacks against signed jars
weijun [Sat, 12 Feb 2011 05:09:36 +0800] rev 8387
6742654: Code insertion/replacement attacks against signed jars 6911041: JCK api/signaturetest tests fails for Mixed Code PIT builds (b91) for all trains 6921823: JarVerifier csdomain field not initialized 6921839: Update trusted.libraries list Reviewed-by: dgu
Fri, 11 Feb 2011 12:20:45 -0800 7007596: (zipfs) FileSystems.newFileSystem(FileRef...) always employs zipfs regardless the real Path type.
sherman [Fri, 11 Feb 2011 12:20:45 -0800] rev 8386
7007596: (zipfs) FileSystems.newFileSystem(FileRef...) always employs zipfs regardless the real Path type. Summary: updated newFileSystem() to throw UOE exception for non-zip/jar file Reviewed-by: alanb
Fri, 11 Feb 2011 01:45:55 -0800 Merge
ohair [Fri, 11 Feb 2011 01:45:55 -0800] rev 8385
Merge
(0) -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 +10000 +30000 tip