commit | 1db8ada1abdc990b8d88aa17155bb8347228887a | [log] [tgz] |
---|---|---|
author | Fred Quintana <fredq@google.com> | Sat Aug 15 21:52:18 2009 -0700 |
committer | Fred Quintana <fredq@google.com> | Sat Aug 15 21:52:18 2009 -0700 |
tree | df0ac3673cac5a656ed979e618d03685b1787050 | |
parent | 75542165b96bfc13b044e06f2f9a838c407915eb [diff] |
do not merge: cherrypicked 1de41c66e767c009663496c899c62caf0e6c5ad7 and 63ccd6a02c219452ea6a16d899e56b4bf500f044 from master branch