Commit Graph

8 Commits

Author SHA1 Message Date
Dave Ward
99ccb72ea5 Merged V4.0-BUG-FIX to HEAD
34060: Merged V4.0 (4.0) to 4.0-BUG-FIX (4.0.1) <<< NOTE ALF-12939 still needs to be done to complete this merge to 4.0.1 >>>
      33056: Fix for ALF-12280: Upgrading from version 3.4.7 to 4.0.0 failed with MS SQL database
       - Added dialect-specific script for SQL Server
      33059: Fix for ALF-12127, ALF-11161, ALF-11988
         Merged BRANCHES/DEV/THOR1 to BRANCHES/V4.0
            33049: Fixed follow issues on THOR-839 & THOR-826
                   - Following webscripts now sets "Content-Type" response header to application/json
                   - which makes people search display follow buttons for people correctly
      Fix for ALF-12077
         Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
            32999: Fix for ALF-12050 - IE specific handling of Ajax requests does not correctly respect no-cache setting, need to set Expires header also
      33060: Fix for ALF-12208 - group name encoding
      33072: Merge from HEAD to V4.0
         33071: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
            - Fixed build failure in HeartBeat. It had relied on the fact that the previous LicenseComponent kept calling onLicenseChange every time
              the license was checked. It needed the check 1 minute after the initial bootstrap call as there was a memory model sync issue in the
              HeartBeat constructor to do with setting the URL it needed to call.
      33073: Fix for ALF-12295 - CLONE - Upload issue ? - Failed to get content ... (No such file or directory) ... x22
      33083: Merge from HEAD to V4.0
         33082: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
            - Did not refresh Tortoise window, this file was missed in the last commit
         33080: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
               - On reflection decided to call onLicenseChange every time the license is checked.
                 A change of valid license would not have resulted in a call to onLicenseChange
                 Also have been able to make failure and success code more symmetrical.
               - The previous commit also added a RetryingTransaction around the sendData() call to
                 currentRepoDescriptorDAO.getLicenseKey() which I found while making the HeartBeat
                 changes. As a result we should no longer see the error in 4.0 about there not being a
                 transaction.
      33087: Calendar: Permissions updates, fixes: ALF-12179 & makes the permissions flag boolean.
      33088: FIXED : ALF-11862: An error message appears when you open the "edit task", to request to join the "moderated site"
      Now handles null value
      33102: Fix for ACT #15024-37148 (will update with JIRA no. once available) 
      - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
      33105: Bitrock license notice file.
      33114: Merged DEV to V4.0
         33067: Fix ALF-12206: CMIS: Error getting association information referencing archived node
      33122: Fix for ALF-12316 Repo -> SOLR query uses HTTPClient that only supports 2 simultaneous connections
      - configurable via spring (default if unconfigured is 40 connections to one host and 40 max connections)
      33142: ALF-12339: Prevents ArrayOutOfBoundsException that can occur with concurrent access of i18n bundle in WebScript
   34065: Fix for ALF-12708 (part 2)
     - Alfresco opencmis extensions library
   34093: ALF-10902 : CIFS: No friendly notification occurs when Editor or Collaborator tries to delete content
   34120: ALF-12767 : CIFS TextEdit - File has been modified outside TextEdit
   34125: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
       34094: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
       34095: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
              - caught incorrect exception - so much for reading the Java Doc :-)
              - build fix
   34138: ALF-564 : Is network-protocol-context.xml still useful ?
   34149: Removes more server side rendered dates:
   Fixes: ALF-12965, ALF-12984, ALF-12988.
   34158: Fix for ALF-12741 - Steck specific : error on managing groups
   34176: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
       34155: Fix for ALF-12979 CLONE - Search - searching in site without any images for *.jpg brings back all the documents
              - note this relies on wildcard/prefix/term/phrase all going through the phrase implementation for wildcard from ALF-12162
   34193: Fix for ALF-12205
   34196: Fix for ALF-12758
   34201: ALF-12892: Ensure that document permissions are refreshed in the dialog after being changed
   34214: Switched off the CIFS Kerberos ticket cracking code by default, added a config value to enable it, latest JVMs do not require this. Part of ALF-12294.
   CIFS Kerberos authentication now works with the IBM JDK. 
   34215: Switched off the CIFS Kerberos ticket cracking code by default, added a property to enable it, latest JVMs do not require this. Part of ALF-12294.
   CIFS Kerberos authentication now works with the IBM JDK (and OpenJDK, Oracle/Sun JVMs) 
   34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX:
      32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
      32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
   34220: Minor: follow-on to r34219 (ALF-11563)
   34226: ALF-12780:	Mac OS X Lion 10.7.2: Editing a document via CIFS and TextEdit removes versionable aspect from this file
   34228: ALF-12689: Fixed character encoding issue with dynamic welcome dashlet
   34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
   34240: ALF-12835: Second click in status box no longer clears status
   34241: ALF-11991: Updated DocLib to support categories
   34245: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
   34246: Reverse merge of BRANCHES/DEV/V4.0-BUG-FIX -c 34245
   Due to an 'svn commit' command argument ordering error, I checked in the solrcore.properties files. This reverse merge removes those changes.
   34247: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
   34249: ALF-12782 : IMAP - No friendly notification occurs when a user without delete permissions tries to delete content
   34254: Fix for ALF-13090 SOLR - cross tokenisation field matches too much for "*u*a"
   34262: Fixes: ALF-11557: Publishing Balloon popups appearing in wrong locations. Now appears in correct location in Doc Lib & replaced with standard popup message on Channel Admin page.
   34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
   - if orphaned nodes are identified (eg. via getPath(s)) then attempt partial recovery by placing them in (temp) lost_found
   - ... ALF-12358 ('child' node has deleted parent(s))
   - ... ALF-13066 (non-root 'child' node has no parent(s))
   - for internal use only - allows index tracking (eg. Solr) to continue
   - precursor to fixing underlying root causes
   - includes merge & extension of "testConcurrentLinkToDeletedNode" (from DEV/DEREK/ALF-12358)
   34298: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      34068: Fix for ALF-342 - Entering a search containing a double quote displays pop-up 500 error in OpenSearch JSF component
      34069: Fix for ALF-342 - Completed fix with additional encoded of output HTML
      34070: Fix for ALF-12553 - Users are unable to see more than 100 sites under 'My Sites' page. List length now configurable.
      34080: Fix for ALF-10306 - Share Advanced search issue with the Date Range form values
      34107: Added missing jar lib to wcmquickstart and webeditor dependencies
      34114: Fix for ALF-10284 - User should be informed when user provides invalid credentials while opening document using link
      34151: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         34121: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4 (3.4.8)
            Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
            34100: ALF-12948 : Copyright year on "About Alfresco" page is out of date   
            Updated copyright year to 2012.
         34150: ALF-10976 (relates to ALF-10412)
            - Thumbnail mimetype check should have been >= 0 not > 0.   
      34171: ALF-13016 : TestModel class exits with a return code of 0 even if model fails validation.
      34190: A modifiable map that protects and underlying map from modification
       - When cloning the backing map (in the event of an potentially-modifying operation) keys and values
         are specifically checked for mutability to prevent excessive cloning.
       - Working towards fix for ALF-12855   
      34191: Fix ALF-12855: Improvement for Lucene in memory sorting and improvement for nodeService.getProperty()
       - Use ValueProtectingMap when passing values out of the NodeDAO
       - Solves the problem of map cloning when used internally as well as when calling NodeService.getProperty()
       - If client code retrieves immutable values from the properties, then they will not be cloned
       - TODO: Special handling of entrySet() and keySet() methods (see ALF-12868) to prevent interceptors from
               triggering map cloning
      34230: Fixes: ALF-12520. Adds i18n strings for siteModel
      34253: Fix for ALF-13102 - JBoss: Unathorized responce recieved on a wcs/touch request with clustered alfrescos (ntlm sso enabled).
      34272: ALF-13136 Merged V3.4.7 (3.4.7.5) to V3.4-BUG-FIX (3.4.9)
         34267: ALF-12419 "Garbage collector error" LockAcquisition on the OrphanReaper process
            - Modified OrphanReaper to use newer JobLockRefreshCallback.
              Refresh lock every minute and timeout if it takes longer than an hour.
      34281: ALF-13145: Merged PATCHES/V3.4.7 to V3.4-BUG-FIX
         34273: ALF-13112: Groups are not displayed when 60k sites and 60 groups in the system
            - Timeout adjustment approved by Kev and Erik
      34291: Merged V3.4 to V3.4-BUG-FIX
         34197: ALF-12900 Error occurs in My Documents dashlet
            NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
            Investigation continues, so there may be more changes to stop such nodes being passed in the first place.   
            NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
            Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.   
            - Addition of defensive code around contentData being null and the reader given to the transformer being null.
         34198: ALF-12900 Error occurs in My Documents dashlet
            - File missing from last commit
         34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
            - Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
         34265: Updated installer splash screen for 2012 (thanks Linton!)
         34282: ALF-13059: Windows 7 specific: It's impossible to add documents to DWS
         - Fix by Alex Malinovsky
         34286: ALF-12949: Merged V4.0 to V3.4
            34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers
      34292: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
            34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions
   34299: Merged V4.0 to V4.0-BUG-FIX
      34067: ALF-12423: Prevent script error on IE9
      34102: SPANISH: Fixes minor encoding error
      34115: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/V4.0:
         34099: ALF-12710: Stack specific: It's impossible to log into CMIS Workbench through WebServices binding
      34156: Missed from commit for r34154
      34189: Fix for ALF-12822 - Script error when Add translation
      34216: Fixes: ALF-11938 - A distinction needed making between the i18n labels for company address and personal address - I extended this to other company specific fields too.
      34238: ALF-12864: Removed trailing spaces from installed jodconverter defaults
      - Stopped forms from recognising booleans
      34243: NFS, switch from read-only to writeable file if write access required and cached file was opened read-only. ALF-12193.
      Fix I/O error saving from OpenOffice on Linux.
      34263: Merged HEAD to V4.0
         34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default"
      34264: ALF-12975: alfresco-enterprise-4.0.1-installer-win-x64.exe / x32 installers fail
      - Due to not detecting new stderr file
      34278: ALF-12763: Re-applied change from ALF-7528 after it was lost in r28224 / ALF-5900
         - PutMethod was modified to use only guessed mime type for documents and completely ignore the Content-Type header from client.
   34303: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      33110: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
         33109: ALF-11479: When upgrading from Alfresco Community 3.4.d to 4.0.b, some nodes that are blocked and have versions fail after the upgrade
      33320: Merged BRANCHES\DEV\V4.0-BUG-FIX to BRANCHESV4.0
          33305: ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
      33326: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
          33277    ALF-12468 CLONE - Regression. Searches cause database server to thrash CPU - ALF-12426
      33331: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\V4.0
          33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
              33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
          33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
              33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()
      33398: Merged V4.0-BUG-FIX to V4.0
         33116: ALF-12517: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935.
         33147: FTP implemented set modification date/time command (MFMT). ALF-12105.
         33151: Fix problems with FTP and UTF-8. JLAN-81.
         When using the Java6 Normalizer use the NFC form.
         33158: Fix NFS server swallows exceptions. ALF-11667.
         Startup exception details are now saved.
         33183: Minor fix to exception string in extendBuffer().
      34061: Merged V4.0-BUG-FIX to V4.0 (Start of 4.0.1)
      34062: Merge V4.0-BUG-FIX to V4.0 RECORD ONLY (changes that came from V4.0)
      34109: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0
         34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
            Added missing jar lib to wcmquickstart and webeditor dependencies
      34154: Merged BRANCHES/DEV/V4.0-BUG-FIX/ to BRANCHES/V4.0:
         34149: Removes more server side rendered dates: Fixes: ALF-12965, ALF-12984, ALF-12988.
      34274: Merged V4.0-BUG-FIX to V4.0
         34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
      34288: Merged V3.4 to V4.0
         34197: ALF-12900 Error occurs in My Documents dashlet
            NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
            Investigation continues, so there may be more changes to stop such nodes being passed in the first place.   
            NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
            Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.
            - Addition of defensive code around contentData being null and the reader given to the transformer being null.
         34198: ALF-12900 Error occurs in My Documents dashlet
            - File missing from last commit
         34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
            - Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
         34265: Updated installer splash screen for 2012 (thanks Linton!)
         34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
            34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions   
         34286: ALF-12949: Merged V4.0 to V3.4
            34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-01 11:41:07 +00:00
Kevin Roast
1aa1ef1f13 Merged V3.1 to HEAD
13173: Merged V2.1-A to V3.1
      10964: Fix for ADB-81: String 'Template' in Japanese is not good format
      10971: Fix for ADB-85: Configure dashboard wizard: long items description get truncated
      10972: Fix for ADB-95: All templates should be parameterized using a  such that they pickup the server name and port number of the current installation
      10973: Fix for ADB-117: Configure Dashboard Wizard. Layout word (Step 3) not localized for japanese and french
   13174: Merged V2.1-A to V3.1
      10975: Fix for ADB-118: Content attributes not localized [client templates]
   13182: Merged V2.1-A to V3.1
      11058: Fix for ADB-121: Next & Finish button remain disabled in 'Create Content in your home space' wizard even after entering name when locale is set to French
      11059: Fix for ADB-128: Date format is different for 'Manage Content Rules' in Japanese Locale
   13190: Merged V2.1-A to V3.1
      11070: Fix for ADB-120 ACT 4773
   13192: Merged V2.1-A to V3.1
      11195: Fix for ADB-130: The 'Finish' button doesn't work after editing the content
   13193: Merged V2.1-A to V3.1
      8395: Remove user and group admin actions from Admin console [added config switch - off by default]
      8584: Removed option for user to change password [added config switch - off by default]
      10203: Fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
      10374: Further fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
   13194: Merged V2.1-A to V3.1
      12095: Fix for ADB-131
   13195: Merged V2.1-A to V3.1
      12097: Fix for ADB-133, ADB-134
      12102: Fix for ADB-139
   13196: Merged V2.1-A to V3.1
      12350: Fix for ADB-142
   13197: Merged V2.1-A to V3.1
      12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
      12878: Merged record-only for V2.1-A to HEAD 
         12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
   13198: Merged V2.1-A to V3.1
      12977: Fix for ADB-158: Intermittent error while accessing the login page
      13142: Another fix for ADB-158: Intermittent error while accessing the login page
   13199: Merged V2.1-A to V3.1
      11589: Fix for ADB-95: All templates should be parameterized

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-11 14:45:20 +00:00
Derek Hulley
223934268c Merged V2.1 to HEAD
6466: Xml metadata.  Support for pulling collections of values from XML
   6470: Fix for AWC-1321 - Using zero as items per page gives error for Alfresco repos in OpenSearch
   6471: Fix for AWC-1496 - OpenSearch dashlet can get in a state where search queries are not executed
   6472: Fix for AWC-1495. Searching additional attributes now working correctly for folders.
   6473: Fix for AR-1251 (Version error when saving new content via CIFS)
   6474: Updated bundles and installers - added missing files back into Linux bundle
   6475: LDAP and chainging authentication
          Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\security\authentication\AuthenticationUtil.java'
   6477: XForms WCM-696.
   6478: Fix for WCM-567 (IndexOutOfBoundsException when stepping through wizard rapidly)
   6480: Fix to issue when removing locks on directories.
   6481: Updated installer and config wizard to fix download option and config behaviour when called from installer.
   6482: Fix for WCM-1229 (properties sheet does not refresh)
   6483: Fix for AR-1511
   6484: Fix for AR-1351
   6485: Missed a unit test update


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-10 22:57:18 +00:00
Kevin Roast
bd0b9c5fcd OpenSearch results shown in the web-client now have an icon to pop-up the AJAX document preview panel for the item.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5878 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-07 11:44:20 +00:00
Derek Hulley
d3ea87e5e2 Merged V2.0 to HEAD
5091:  AWC-1118
   5092:  pooledactor assignment
   5100:  AWC-1133
   5103:  CML copy and cm:name
   5106:  Bubble view discussion topics
   5107:  AWC-1030, AWC-1137, Console buttons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-06 13:20:00 +00:00
Kevin Roast
a4aa830af2 Merged from BRANCHES/DEV/KEVINR:
. NodeInfo panel and Ajax client library
 - Rewrite of Node Info panel
 - Alfresco common DOM methods refactored into namespaced object (YUI/Dojo style) Alfresco.Dom
 - Addition of useful DOM and 'smart' alignment method to common.js
 - OpenSearch now uses additional namespace for it's global method handlers: Alfresco.OpenSearchEngine
 - Temporary icons added for pop-up node info panel
. Additional FreeMarker model API method "cropContent(contentprop, length)" to return the first N bytes of a content stream - auto converted to plain/text from all supported transformation mimetypes
. DownloadContentServlet now handles ContentIOException more gracefully
. AbstractContentReader fixed to handle empty file data when requesting N characters from a content stream

. Yahoo scripts move to PageTag rendering as appropriate
. Refactoring of existing ajax components that output Yahoo scripts

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-01 17:24:08 +00:00
Gavin Cornwell
7a187e6a9a - Updated OpenSearch UI after Linton review
- Multiple OpenSearch clients can now be added to a single page
- Configured OpenSearch as a dashlet
- Made the lookup for beans in portal session more rigorous for AJAX invoke command
- Updated paging graphics

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4942 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-26 15:26:59 +00:00
Derek Hulley
9c17a38488 Merged DEV\EXTENSIONS to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4865 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4866 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4872 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4884 .
   Dave and Gavin's search work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-23 12:09:27 +00:00