andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,668 Commits 1 Branch 0 Tags 21 MiB
7c00ddb2a9
Commit Graph

385 Commits

Author SHA1 Message Date
Cas Cremers
8fe754f4ec Moved key-compromise models into their own directory and removed key-compromise models from base protocols. 2007-11-16 09:00:23 +01:00
Cas Cremers
b02c09f0dd Disabled --check for gui as well. 
--check is not working correctly, so we should disable it for now.
 2007-11-15 21:49:35 +01:00
Cas Cremers
870d1c2f41 BUGFIX: PIL no longer works on my Feisty machines: PIL disabled. 
Currently, both my Feisty Ubuntu's have stopped working with the GUI of
Scyther. So to be on the safe side, PIL is disabled for now, until I've
resolved the problem.

The error is the following:

---------------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/cas/src/scyther-dev/gui/Gui/Scytherthread.py", line 351, in onViewButton
    w = Attackwindow.AttackWindow(btn.claim)
  File "/home/cas/src/scyther-dev/gui/Gui/Attackwindow.py", line 176, in __init__
    self.CreateInteriorWindowComponents()
  File "/home/cas/src/scyther-dev/gui/Gui/Attackwindow.py", line 209, in CreateInteriorWindowComponents
    dp = AttackDisplay(self, self, attacks[0])
  File "/home/cas/src/scyther-dev/gui/Gui/Attackwindow.py", line 73, in __init__
    self.original = Image.open(filename)
  File "/usr/lib/python2.5/site-packages/PIL/Image.py", line 1912, in open
    return factory(fp, filename)
  File "/usr/lib/python2.5/site-packages/PIL/ImageFile.py", line 82, in __init__
    self._open()
  File "/usr/lib/python2.5/site-packages/PIL/EpsImagePlugin.py", line 277, in _open
    raise IOError, "cannot determine EPS bounding box"
IOError: cannot determine EPS bounding box
---------------------------------------------------------------------------

Great. Bounding boxes in eps again.
 2007-11-13 20:51:20 +01:00
Cas Cremers
6e65138dca Added --license switch to the Gui. 2007-10-08 14:52:50 +02:00
Cas Cremers
dd57481991 Added note to changelog. 2007-10-08 14:14:24 +02:00
Cas Cremers
59d061c47f Patch by Alberto Piai to address new integration of (c)elementtree into core python. 2007-10-08 13:59:16 +02:00
Cas Cremers
44f89d8e78 Added GPL 2 notice in the 'about' box. 2007-06-11 14:20:53 +02:00
Cas Cremers
f901951e4b Added GPL 2 to the Python scripts. 2007-06-11 14:12:33 +02:00
Cas Cremers
7d584cca1e Added GPL 2 License to the C sources. 
A first step towards releasing Scyther completely to the public.
 2007-06-11 14:01:04 +02:00
Cas Cremers
d5ba325233 Workaround for strange wxPython display error. 
Since a while, wxPython has been refusing to correctly display strings with a dash in them in the staticText object. Given a string "xx-yy", only "xx" is displayed. This caused some problems for protocols with dashes in their protocol names. I've worked around it by replacing all occurrences of "-" by "_".
 2007-05-29 16:39:25 +02:00
Cas Cremers
76c516dee0 Merge branch 'reverting-b7' into release 2007-05-21 16:41:19 +02:00
Cas Cremers
742cbcda60 - Added some ignore patterns. 2007-05-21 13:56:00 +02:00
Cas Cremers
b80de55289 Merge branch 'testing' of cas@roivas.shape9.nl:/export/git/scyther into reverting-b7 2007-05-21 13:48:56 +02:00
Cas Cremers
a09cf686f9 - Modified explanation too. 2007-05-21 13:34:46 +02:00
Cas Cremers
461895555b - Removed Bin subdirectory and updates scripts. 2007-05-21 13:34:43 +02:00
Cas Cremers
38a5d04c8c - Fix to the reverter. 2007-05-21 13:32:57 +02:00
Cas Cremers
38f1bffcef - Reverted version of beta7 for testing. 2007-05-21 13:29:33 +02:00
Cas Cremers
db78f91af1 Fixed version information updates of both the compiled code as well as the Gui. 2007-05-20 16:14:40 +02:00
Cas Cremers
173b1e8d41 Merge branch 'stable' of ssh://cas@roivas.shape9.nl/export/git/scyther-develop/ 
Conflicts:

	gui/Gui/Scytherthread.py
 2007-05-19 23:38:10 +02:00
Cas Cremers
f1e35b1cde - Fixed ns/nsl and mpa example. 2007-05-19 18:02:36 +02:00
Cas Cremers
9063c00f55 - Switched encoding of Changelog so windows users can read it too. 2007-05-19 17:57:18 +02:00
Cas Cremers
9aa39bfbe2 - SPORE moved into gui directory by default. 2007-05-19 17:10:46 +02:00
Cas Cremers
0ba35eb983 - Updated changelog. 2007-05-19 17:06:06 +02:00
Cas Cremers
d1b810d9fc - Updated. 2007-05-19 17:04:57 +02:00
Cas Cremers
76f0db6f13 - Got rid of a lot of garbage. 2007-05-19 17:02:18 +02:00
Cas Cremers
f837d1b000 Integrated XP fixes 2007-05-19 16:27:28 +02:00
Cas Cremers
4bf7126a45 - Removed binaries (no longer part of the tree) 2007-05-19 15:55:46 +02:00
Cas Cremers
3dfb8d6173 - Fixed font settings for Unix. 2007-05-19 15:43:57 +02:00
Cas Cremers
f47c1e7e5e - Factored out the safe external command process. It turns out that the shell should not be used under windows Popen, but on the other hand is must be used under Linux. 2007-05-19 15:32:58 +02:00
Cas Cremers
23931281d0 - Font problems seem to be partially fixed on windows. Note that the font is not found, so rendering is ugly, but at least the text does not flow over the boxes anymore. 2007-05-19 15:19:02 +02:00
Cas Cremers
688416a351 - Rewrite subprocess access to the newer subprocess.Popen module. This seems to work just fine for Windows XP, at least. 2007-05-19 14:29:32 +02:00
Cas Cremers
ee5d0cbfe8 - Reverted a patch for the fonts. 2007-05-18 14:17:24 +02:00
Cas Cremers
ef2af6b097 - Removed font print debugging information. 2007-05-18 14:12:32 +02:00
Cas Cremers
1542d65def - Big catchup commit to make sure we are up to beta7. 
This includes a number of single patches, ranging from the vista fix with the buffers, to the start of many new minor features.
 2007-05-18 14:06:29 +02:00
Cas Cremers
7c8ca527b2 - Updates (fast forwarding to latest Scyther from svn) 2007-05-18 13:55:11 +02:00
Cas Cremers
d64d89b063 - Added further notes 2007-05-17 17:35:47 +02:00
Cas Cremers
d622b14257 - Big restructuring of the directories 2007-05-17 17:28:10 +02:00
ccremers
eea7a09730 - New type versioning for the Mac too 2007-05-03 15:54:00 +00:00
ccremers
09419702d8 - New version mechanism in place 2007-05-03 15:52:51 +00:00
ccremers
32e6070a26 - New Mac version 2007-05-03 15:47:15 +00:00
ccremers
14170f603f - New binaries 2007-05-03 13:26:04 +00:00
ccremers
1558ef1987 - New Mac binary 2007-05-03 13:25:30 +00:00
ccremers
9882651f4a - Fixed role comparison bug. 2007-02-01 12:18:38 +00:00
ccremers
6e82d585be - Errors now get a nice colour 2007-01-31 15:45:05 +00:00
ccremers
c63b87c750 - Oops. 2007-01-31 12:20:44 +00:00
ccremers
ed433130e2 - New binaries. 2007-01-31 11:24:25 +00:00
ccremers
6f59ed3ab3 - Got rid of ctrl-W mapping to be nice to silly Emacs users. 2007-01-30 19:58:12 +00:00
ccremers
2ff5adf040 - Minor cleanup on Scyther output parser. 2007-01-30 17:43:58 +00:00
ccremers
17d1898b29 - Factored out editor component. 2007-01-30 11:01:17 +00:00
ccremers
6f5846d09f - Added new binaries for both windows and linux 2007-01-29 22:56:56 +00:00
ccremers
33df1ccb5b - Enabled Scintilla editor 2007-01-29 16:32:35 +00:00
ccremers
df62d65d5c - Fixes to error output 2007-01-29 15:17:11 +00:00
ccremers
cf84e83f9f - Scanned protocols for new obligatory check. 2007-01-29 15:05:15 +00:00
ccremers
5d0b15e292 - Reinstated the graphical about screen. 2007-01-27 22:52:22 +00:00
ccremers
70a718807e - Improved error handling: any Scyther errors now raise an exception. 
This can be dealt with accordingly. If no error occurs, we can just
  nicely assume the output is a claim list or something similar.
 2007-01-27 21:42:16 +00:00
ccremers
6cd4d3d7b6 - Added new feature to changelog (scripting interface for singular claim 
testing)
 2007-01-27 13:11:07 +00:00
ccremers
836f30c26a - Bugfixes for singular claim testing support. 2007-01-27 13:08:24 +00:00
ccremers
0e21a2bd20 - Added scripting support for claim list retrieval and single claim 
evaluation.
 2007-01-27 12:53:19 +00:00
ccremers
1eb1e7849e - Fixes, feature additions. 2007-01-27 10:04:18 +00:00
ccremers
eaa6ef1345 - Added feature for multi-party protocols (weaker precondition on Reachable) 2007-01-16 17:22:51 +00:00
ccremers
fd0004bd9f - New static version. 2007-01-12 22:16:37 +00:00
ccremers
d8da0a083f - Warnings should not cause the output to be ignored 2007-01-12 10:02:56 +00:00
ccremers
994ff7b095 - Added new Linux and Windows binaries (beta6) 2007-01-11 13:03:11 +00:00
ccremers
fa42e15d3d - More version updates. 2007-01-11 11:22:57 +00:00
ccremers
412c75cc51 - Working towards text attack output. 2007-01-10 14:32:08 +00:00
ccremers
1ecc43e9d6 - Fixes to font things. 2007-01-10 14:30:52 +00:00
ccremers
4d9a567646 - Added universal binary 2007-01-09 16:12:48 +00:00
ccremers
ae65d0a30d - Fixed bug in new trace code. 2007-01-09 16:11:58 +00:00
ccremers
c3f1d9661a - New naming scheme for mac binaries. 2007-01-09 14:37:17 +00:00
ccremers
24bf895890 - Added error report in case of no output at all. (Tailored for reported 
OS X problem.)
 2007-01-02 15:34:58 +00:00
ccremers
903f9bcbce - Fixes working towards attack indent output. 2007-01-02 15:22:25 +00:00
ccremers
f3f6e56feb - Uncommented previously commented code. 2006-12-20 17:20:09 +00:00
ccremers
807232a51e - Sanitized the settings window a bit. 2006-12-15 13:45:09 +00:00
ccremers
a459002ae9 - Final builds for today. 2006-12-14 21:00:06 +00:00
ccremers
38dd697f41 - Bug seems to be resolved! 2006-12-14 20:32:24 +00:00
ccremers
8f1e1ae8a9 - Complete rewrite of Scyther call (also preparing for Mac OS X versions) 2006-12-14 20:08:34 +00:00
ccremers
aac06d3c43 - Some code refactoring. 2006-12-14 19:46:36 +00:00
ccremers
7786e0d65f - Added 'append' switches and modified gui behaviour correspondingly. 2006-12-14 16:28:29 +00:00
ccremers
7eb354d22c - Correction to previous commit: added required files. 2006-12-14 14:08:08 +00:00
ccremers
4e2b7c405b - Improved error handling. 2006-12-14 14:06:50 +00:00
ccremers
2886e1a7e5 - Hopefully improved the attack displays. Needs checking. 2006-12-13 15:43:10 +00:00
ccremers
68e9ad9cf4 - New compiled version, ready for platform-testing on windows. 2006-12-13 13:48:33 +00:00
ccremers
0cf1affc26 - Threw out possibly offending statement. 2006-12-13 13:44:34 +00:00
ccremers
5a4fae93b3 - More fixes for beta5 2006-12-13 13:08:33 +00:00
ccremers
e7334d1050 - Misc fixes. 2006-12-13 12:16:36 +00:00
ccremers
4750f1b309 - Thread rewrite for improved stability 2006-12-13 11:59:44 +00:00
ccremers
acafc18926 - Fixed scytherview script. 2006-12-13 09:40:53 +00:00
ccremers
10d337d99b - Moved Binaries to Scyther subdir. 
- Made kpdf the default..
 2006-12-13 09:09:48 +00:00
ccremers
0ec3b566d6 - Modified the default for resizing. 2006-12-12 16:33:21 +00:00
ccremers
e31f6f58d3 - Woops. 2006-12-11 10:43:00 +00:00
ccremers
bd03983fc5 - Final fixes for beta 5 2006-12-11 10:12:03 +00:00
ccremers
6d7b2a2d73 - Removed popen3 dependency, hopefully improving stability of the Gui 
quite a bit.
 2006-12-11 09:40:57 +00:00
ccremers
b8c57a1395 - Added --errors switch. 2006-12-11 09:18:54 +00:00
ccremers
6629b29559 - Fixed stuff for Python versions that do not support __file__ well, by basically requiring that the Scyther binary can be found in PATH. 2006-11-24 08:00:03 +00:00
ccremers
f2f35f5548 - Added simple scytherview (python only). Needs some further work to be 
usable though.
 2006-11-23 13:26:27 +00:00
ccremers
271550a55a - Better builders and naming. 
- Some cleanup.
 2006-11-23 11:46:33 +00:00
ccremers
31d8ff02b6 - Added new linux binary. 2006-11-23 11:39:56 +00:00
ccremers
17f4f34d23 - Improved locating binaries etc. 2006-11-23 11:28:51 +00:00
ccremers
61828765b9 - Improved error reporting for missing libs. 
- Moved all binaries to Bin/ (untested here as stupid thing does not work.)
 2006-11-14 11:03:19 +00:00
ccremers
4cab253e7c - Improved error reporting. 2006-11-13 10:38:47 +00:00
ccremers
37b855d9ec - Added the OSX binaries generated by Martijn Warnier. 2006-10-02 19:46:19 +00:00
ccremers
1650c6f64b - Cleaner platform distinguishing code. 2006-09-21 13:19:22 +00:00
ccremers
cf45f8780b - Wider boxes. 2006-08-12 12:37:08 +00:00
ccremers
fe18bf0fa1 - Removed obsolete stuff. 2006-08-11 17:59:08 +00:00
ccremers
78d6a17705 - Improved documentation. 2006-08-11 17:52:44 +00:00
ccremers
c83f7313b2 - Better readme. 2006-08-11 17:32:51 +00:00
ccremers
eefc870f41 - Better Aboet. 
---This line, and those below, will be ignored--

M    gui/Gui/About.py
 2006-08-11 17:29:18 +00:00
ccremers
79e664c181 - Improved stuff for mpa attacks. 
- Some todo addition.
 2006-08-11 17:25:34 +00:00
ccremers
3728019380 - Compiled new version. 2006-08-11 17:22:51 +00:00
ccremers
5c53668556 - Added new version. 2006-08-11 17:16:22 +00:00
ccremers
285a230f67 - More moving. 2006-08-11 16:57:58 +00:00
ccremers
5d3c1449aa - Moved stuff to a design directory. 2006-08-11 16:52:55 +00:00
ccremers
ef8ba74e35 - Fix+. 2006-08-11 15:44:36 +00:00
ccremers
ad5e081f83 - Bugfix: to often recomputation of stuff. 2006-08-11 15:43:04 +00:00
ccremers
d6fde09885 - Bugfix. 2006-08-11 15:38:25 +00:00
ccremers
3b6794de34 - Bugfixes. 2006-08-11 15:36:23 +00:00
ccremers
c3ce3c37d4 - Many fixes. 2006-08-11 15:23:32 +00:00
ccremers
683cae8d90 - Minor. 2006-08-11 14:22:45 +00:00
ccremers
cdbb2c72b7 - Fixed path issue. 2006-08-11 11:04:22 +00:00
ccremers
a517d729ef - Added separate about box. 2006-08-11 10:43:28 +00:00
ccremers
40ec83be66 - Added some credits. 2006-08-11 10:19:12 +00:00
ccremers
2126cf01f4 - Moved okay status thing also to claims. 2006-08-11 09:58:20 +00:00
ccremers
11126dfa27 - Better colour definitions for status 2006-08-11 09:51:24 +00:00
ccremers
33b3b0fa69 - Better colour definitions for status 2006-08-11 09:49:34 +00:00
ccremers
9ce483095d - Refactoring, explanations, added button. 2006-08-11 09:41:12 +00:00
ccremers
ddb9e11ac5 - Improved settings window. 2006-08-11 08:54:43 +00:00
ccremers
4b98120da9 - Improved refactoring, layout. 2006-08-11 08:34:22 +00:00
ccremers
6069b36cd5 - Compiled new version (no font output) 2006-08-11 08:11:25 +00:00
ccremers
f9ece7d497 - Some improvements in interpretation of claim ranks 2006-08-10 16:15:38 +00:00
ccremers
f8400ac02f - Added more colour states, better refactoring 2006-08-10 15:49:07 +00:00
ccremers
97b08c0c48 - Added more colour states, better refactoring 2006-08-10 15:48:12 +00:00
ccremers
10840031ca - Added more colour states 2006-08-10 15:39:09 +00:00
ccremers
e927056c06 - Better claim description and better factoring 2006-08-10 15:26:15 +00:00
ccremers
51fbffcacd - Remove zoom button when we do not have PIL and Linux 2006-08-10 14:58:08 +00:00
ccremers
74626bd846 - Improved dot output significantly 2006-08-10 14:50:55 +00:00
ccremers
4ba0a0f4d8 - Improved dot output significantly 2006-08-10 14:50:10 +00:00
ccremers
fd57699fd3 - Improved dot output significantly 2006-08-10 14:48:21 +00:00
ccremers
3217f02dd4 - Improved dot output significantly 2006-08-10 14:45:00 +00:00
ccremers
9326426a55 - Improved dot output significantly 2006-08-10 14:42:51 +00:00
ccremers
e297182730 - New version without font settings in the dot output. 2006-08-10 12:38:18 +00:00
ccremers
4290c86a7c - Fixed typo. 2006-08-10 11:51:11 +00:00
ccremers
6b3ab79c43 - Fixed that PIL is only used under Linux 2006-08-10 11:50:57 +00:00
ccremers
3efdeb48a7 - Split readme into readme and install 2006-08-10 08:26:47 +00:00
ccremers
990a266893 - Added control for maximum number of attacks 2006-08-09 15:54:14 +00:00
ccremers
1b7cf5dc3c - Added readme with dependency list. 2006-08-09 13:21:38 +00:00
ccremers
b486c8d3d4 - Note todo. 2006-08-09 12:36:22 +00:00
ccremers
67ad867232 - Capitals are nicer where appropriate. 2006-08-09 12:11:55 +00:00
ccremers
663aa10dc7 - Misc improved again. 2006-08-09 12:08:53 +00:00
ccremers
7b79402d43 - Misc fixes. 2006-08-09 11:54:37 +00:00
ccremers
a660a0a1f7 - Better path handling. 2006-08-09 11:39:35 +00:00
ccremers
b2bc575447 - Some fixes. 2006-08-09 11:36:33 +00:00
ccremers
9c819b71d9 - Some updates. 2006-08-09 11:28:01 +00:00
ccremers
0c3f860b7b - Got rid of stupid buttons. 2006-08-09 10:21:30 +00:00
ccremers
70fa59a9b5 - Improved. 2006-08-09 10:07:57 +00:00
ccremers
c2caa0da8a - Resolved potential error involved with closing stuff and addressing it 
later.
 2006-08-09 09:53:52 +00:00
ccremers
3a2505dd18 - Nicer cursors. 2006-08-09 09:46:45 +00:00
ccremers
77621fae0b - Reinstated buttons. 2006-08-09 09:41:14 +00:00
ccremers
094bd5bed3 - Quote-trick. 2006-08-09 09:33:50 +00:00
ccremers
2cd1178905 - Improved binary locator. 2006-08-09 09:26:15 +00:00
ccremers
b180735f78 - Added a windows resource file. 2006-08-09 09:13:39 +00:00
ccremers
cf2982b287 - Significantly improved result windows. 2006-08-09 09:04:03 +00:00
ccremers
b5deb0fbaf - Fixed layout of result window. 2006-08-09 07:59:57 +00:00
ccremers
1f99ec6947 - Fixed thread button update problem. 2006-08-08 21:49:37 +00:00
ccremers
529892e640 - More consistency updates 2006-08-08 17:07:15 +00:00
ccremers
e14d165816 - Some reshuffling should restore matters. 2006-08-08 17:04:26 +00:00
ccremers
6f59760a70 - Misc fixes, todo list. 2006-08-08 16:16:28 +00:00
ccremers
9697e22414 - Oops, forgot stuff. 2006-08-08 15:59:25 +00:00
ccremers
e6ec1ecd99 - Added python wrapper around the command-line tool. 2006-08-08 15:57:27 +00:00
ccremers
166f618cb9 - Refactoring stuff into a package. 2006-08-08 15:54:00 +00:00
ccremers
0b21755928 - Minor fixes. 2006-08-08 15:14:51 +00:00
ccremers
89acf05fe1 - Fixed many windows issues (including the redraw speed) 2006-08-08 15:00:20 +00:00
ccremers
d2e3aaa869 - Well we really don't need that anymore, the problem is solved. 2006-08-08 14:03:00 +00:00
ccremers
3256a38a65 - Windows output for recompiles now goes directly to the correct location. Saves me time. 2006-08-08 14:02:05 +00:00
ccremers
6b3f0bd28a - Solved background colour issue. 2006-08-08 13:58:56 +00:00
ccremers
c1c53e8e2c - Testing thing. 2006-08-08 13:50:07 +00:00
ccremers
c1b44804e1 - Layout improvements. 2006-08-08 13:19:17 +00:00
ccremers
f659cce889 - Improved multi-protocol attack script. 2006-08-08 13:18:09 +00:00
ccremers
1aabf79f08 - Created multi-protocol attack detection script. 2006-08-08 13:03:02 +00:00
ccremers
a6933806f9 - MPA analysis script (but it will only work nicely once the claim 
select functionality is in the Scyther backend)
 2006-08-07 18:23:30 +00:00
ccremers
8bff33dc82 - Updated Scyther interface. 2006-08-07 16:40:46 +00:00
ccremers
40bc144d88 - Compiled new windows executable. 2006-08-07 16:39:34 +00:00
ccremers
8b311e0411 - Bugfix: no double adding. 2006-08-07 16:36:54 +00:00
ccremers
ffafe946cf - Fixes. 2006-08-07 16:25:47 +00:00
ccremers
3cd37d25f6 - Improved option parser and friends. 2006-08-07 15:06:10 +00:00
ccremers
83f2b55f0c - Huge improvements on zooming stuff, we now have nice buttons. 2006-08-07 14:02:59 +00:00
ccremers
6b5f83f762 - Added parameters for automatic starts. (try filename --verify) 
- Splash screen can now be disabled.
 2006-08-07 12:59:22 +00:00
ccremers
1376f930fd - Bugfix with non-pil resizing. 2006-08-07 12:13:39 +00:00
ccremers
57b5d00056 - Added incomplete knowledge test. 2006-08-07 11:55:01 +00:00
ccremers
44e84d1a08 - Misc fixes. 2006-08-07 11:54:43 +00:00
ccremers
6e759327cf - Bugfixes for non-pil stuff. 2006-08-07 11:33:25 +00:00
ccremers
01b62e5786 - Added progress report, but it does not seem to update regularly yet. 2006-08-07 11:26:39 +00:00
ccremers
7bae7875a0 - Huge improvement in error output. 2006-08-07 11:02:14 +00:00
ccremers
3178e8e90c - Fixed error output. 2006-08-07 10:52:48 +00:00
ccremers
9a182784a3 - Moved binaries and images to correct subdirectories 2006-08-07 10:42:34 +00:00
ccremers
f8480f0815 - Some notes. 2006-08-07 10:35:17 +00:00
ccremers
bb0511079e - Claims are processed the other way around, which is much nicer. 2006-08-07 09:59:26 +00:00
ccremers
1350c0cd03 - Errors are now reported. 2006-08-07 09:31:49 +00:00
ccremers
5d02e446c9 - Added errorcount to Scyther object. 2006-08-06 21:16:14 +00:00
ccremers
756e69bd4f - Error is captured nicely and printed (for now). We need an error 
window for that, instead of a results window.
 2006-08-06 19:57:01 +00:00
ccremers
ea9c4d5334 - Solved blocking error. 2006-08-06 19:52:07 +00:00