Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,680 Commits 28 Branches 95 Tags 527 MiB
9d695790d0
Commit Graph

2273 Commits

Author SHA1 Message Date
Don Allingham
3c31f1e2ec 2006-04-18 Don Allingham <don@gramps-project.org> 
* src/plugins/Desbrowser.py: bring up to speed with ManagedWindow
	* src/GrampsWidgets.py: fix the type return value 



svn: r6353
 2006-04-18 19:10:13 +00:00
Don Allingham
3ae608af89 image and screen updates 
svn: r6352
 2006-04-18 02:09:43 +00:00
Don Allingham
6aa2d3e50f Set author for source on gedcom import 
svn: r6351
 2006-04-17 22:33:13 +00:00
Brian Matherly
36816a7562 src/plugins/DescendReport.py: Don't sort children (Bug #1453010) 
svn: r6350
 2006-04-17 04:09:00 +00:00
Don Allingham
0ce28d7339 event description on xml import 
svn: r6349
 2006-04-16 04:37:02 +00:00
Alex Roitman
49a8a2e62c 2006-04-15 Alex Roitman <shura@gramps-project.org> 
* src/GrampsDb/_GrampsBSDDB.py (gramps_upgrade_9): Adapt to 
	ChildRefType.



svn: r6347
 2006-04-15 19:48:12 +00:00
Don Allingham
6fe0f08334 handle child type callback 
svn: r6346
 2006-04-15 06:24:35 +00:00
Alex Roitman
4a373a8a37 2006-04-14 Alex Roitman <shura@gramps-project.org> 
* src/DisplayTabs.py (edit_button_clicked): Proceed only if
	selection exists.



svn: r6345
 2006-04-14 22:31:23 +00:00
Don Allingham
c463c8e846 Handle ChildRefType on XML import 
svn: r6344
 2006-04-14 16:00:46 +00:00
Martin Hawlisch
ec90f9f0e2 typo 
svn: r6343
 2006-04-14 12:40:07 +00:00
Martin Hawlisch
75e4f7b39b * src/DataViews/_PedigreeView.py: Fix ChildRef, Show person references 
* src/Editors/_EditFamily.py: Typo
* src/GrampsDb/_GrampsDbBase.py (get_active_person): Handle case of no active person
* src/plugins/TestcaseGenerator.py: really generate shared events; use new GrampsType; randomize name type
* src/DataViews/_PersonView.py: DnD only for lines of persons; Fix set for python 2.3; fix get_parent_family_handle_list usage



svn: r6342
 2006-04-14 12:39:17 +00:00
Don Allingham
e99a795581 Start of new type classes 
svn: r6340
 2006-04-14 04:36:25 +00:00
Don Allingham
efd56461dd ASSO tag support 
svn: r6339
 2006-04-13 20:24:19 +00:00
Martin Hawlisch
d03c217524 more ChildRef changes 
svn: r6338
 2006-04-13 19:44:35 +00:00
Don Allingham
253da2a4a7 Fix family/child refs 
svn: r6337
 2006-04-13 19:34:07 +00:00
Martin Hawlisch
b2d59995e3 Adapt to changes in RelLib 
svn: r6336
 2006-04-13 19:29:36 +00:00
Martin Hawlisch
64a54f8de4 Updates to use ChildRef 
svn: r6335
 2006-04-13 19:20:11 +00:00
Alex Roitman
46ba3c97b5 * src/RelLib/_PersonRef.py (serialize): Typo. 
svn: r6334
 2006-04-13 18:33:29 +00:00
Don Allingham
62165e4c12 Remove bad tab 
svn: r6333
 2006-04-13 18:30:17 +00:00
Alex Roitman
a59ef557fa * src/GrampsDb/_GrampsBSDDB.py: Upgrade path to new RelLib. 
* src/RelLib/_Family.py: Require non-empty child_ref.


svn: r6332
 2006-04-13 18:25:52 +00:00
Alex Roitman
39cf9582f7 Updates 
svn: r6330
 2006-04-13 17:10:29 +00:00
Don Allingham
f477a3cdf3 Start childref conversion 
svn: r6327
 2006-04-13 16:16:00 +00:00
Martin Hawlisch
fbd8b4546c * src/RelLib/*: fix different typos. 
* src/DataViews/_FamilyView.py: adapt changes in RelLib
	



svn: r6326
 2006-04-13 11:21:33 +00:00
Alex Roitman
f0d9aed4c1 * src/NameDisplay.py: Add constants to number name components. 
* src/PeopleModel.py: Correct constants.


svn: r6324
 2006-04-13 05:26:19 +00:00
Alex Roitman
7a61396025 Add ChildRef class, reorganize RelLib. 
svn: r6320
 2006-04-13 03:15:22 +00:00
Brian Matherly
0eb3838f92 Add graph preview based on MIME type. 
svn: r6319
 2006-04-13 03:01:12 +00:00
Alex Roitman
a5a961584b Fix typo 
svn: r6318
 2006-04-12 16:41:33 +00:00
Alex Roitman
0b4e863e9e * src/RelLib/_PersonRef.py: Add to repository. 
* src/RelLib/Makefile.am: Ship new file.
	* src/RelLib/_Person.py: Add person_ref_list to store person-to-
	person references.


svn: r6317
 2006-04-12 06:57:14 +00:00
Alex Roitman
984ba66431 * src/GrampsDb/_DbUtils.py (remove_parent_from_family): If removing family, also remove it from the child's parent_family_list. 
svn: r6314
 2006-04-12 03:06:25 +00:00
Alex Roitman
fa333d489d Update 
svn: r6313
 2006-04-11 22:28:32 +00:00
Martin Hawlisch
1509ce913f * src/images/mk_blue_marble.py: Provide fallback if jpegtrans does not work/exist. 
svn: r6311
 2006-04-11 17:04:42 +00:00
Martin Hawlisch
a480bd4ded * src/images/mk_blue_marble.py: Properly exit on error to let make stop in that case. 
svn: r6310
 2006-04-11 11:31:02 +00:00
Martin Hawlisch
83a6d06277 * src/DataViews/_MapView.py: Reworked to display multiple smaller tiled map images 
* src/images/mk_blue_marble.py: Script to create the map tiles out of the nasa blue marble image
* src/images/Makefile.am: Add map tile images and bootstrap them using mk_blue_marble.py



svn: r6307
 2006-04-10 21:41:42 +00:00
Don Allingham
a6ccb47a55 Handle active person and Pedigree startup issues 
svn: r6306
 2006-04-10 20:56:09 +00:00
Alex Roitman
2f67795c39 * src/GrampsDb/_ReadGedcom.py: LDS fixes. 
* src/Editors/_EditLdsOrd.py: LDS fixes.
	* src/lds.py: LDS fixes.


svn: r6304
 2006-04-10 18:38:13 +00:00
Alex Roitman
edfe00dd54 * src/ArgHandler.py: Get rid of obsolete self.parent. 
svn: r6302
 2006-04-10 18:17:00 +00:00
Don Allingham
e37110ba5b Fix adding spouse after family exists 
svn: r6301
 2006-04-10 16:11:03 +00:00
Alex Roitman
82e7835f87 Update 
svn: r6300
 2006-04-10 05:50:06 +00:00
Alex Roitman
8fc68feaca * src/ViewManager.py (ViewManager.create_pages): Use toggle 
buttons on the sidebar.
	(ViewManager.change_page): Turn off previously active button.


svn: r6299
 2006-04-10 05:49:20 +00:00
Alex Roitman
3c5912df5f Update 
svn: r6298
 2006-04-10 05:44:59 +00:00
Brian Matherly
cbcef67f59 Improve graphic alignment in OO reports. (Bug 1370498) 
svn: r6297
 2006-04-10 04:29:29 +00:00
Alex Roitman
9b3b2fe2e5 (GrampsBSDDB._delete_primary_from_reference_map): Accept txn 
argument; pass it on to self._remove_reference().
	* src/GrampsDb/_GrampsBSDDB.py (GrampsBSDDB._do_remove_object):
	Work out both regular and batch transactions.


svn: r6296
 2006-04-10 01:45:36 +00:00
Alex Roitman
dc434a5736 * src/Makefile.am: Clean byte-compiled files. 
* src/DataViews/Makefile.am: Clean byte-compiled files.
	* src/GrampsDb/Makefile.am: Clean byte-compiled files.
	* src/Config/Makefile.am: Clean byte-compiled files.
	* src/RelLib/Makefile.am: Clean byte-compiled files.
	* src/Editors/Makefile.am: Clean byte-compiled files.
	* src/plugins/Makefile.am: Clean byte-compiled files.
	* src/ObjectSelector/Makefile.am: Clean byte-compiled files.
	* src/TreeViews/Makefile.am: Clean byte-compiled files.
	* src/Models/Makefile.am: Clean byte-compiled files.
	* src/Mime/Makefile.am: Clean byte-compiled files.
	* src/GrampsLogger/Makefile.am: Clean byte-compiled files.
	* src/PluginUtils/Makefile.am: Clean byte-compiled files.
	* src/docgen/Makefile.am: Clean byte-compiled files.
	* src/DateHandler/Makefile.am: Clean byte-compiled files.


svn: r6295
 2006-04-10 01:02:50 +00:00
Don Allingham
fb27b07fc1 Start of migrating tools to Managed Windows 
svn: r6294
 2006-04-09 22:53:53 +00:00
Don Allingham
4cc621cc56 remove empty families 
svn: r6293
 2006-04-08 05:56:31 +00:00
Brian Matherly
0d8e481893 * src/docgen/PdfDoc.py: fix columns, error check images 
* src/docgen/RTFDoc.py: error check images

svn: r6292
 2006-04-08 01:59:33 +00:00
Don Allingham
4b2c5d5136 EditName call in EditPerson 
svn: r6289
 2006-04-07 20:28:41 +00:00
Don Allingham
d3cefa135e restore attr_edit in glade file 
svn: r6286
 2006-04-07 04:32:43 +00:00
Don Allingham
54a86db801 select parents from relationship view 
svn: r6283
 2006-04-07 02:54:33 +00:00
Alex Roitman
57d6df04c9 * various: Revert back to using gettext except for the modules that need context -- those will use TransUtils.sgettext 
svn: r6282
 2006-04-06 22:02:46 +00:00
Alex Roitman
ecc87ea678 * POTFILES.in: Add new files to the list. 
* gramps.pot: regenerate the template.
	* src/Makefile.am (gdir_PYTHON): Add new files to the list.


svn: r6281
 2006-04-06 21:51:33 +00:00
Alex Roitman
1d24bc8f13 * src/Editors/_EditLdsOrd.py (EditLdsOrd): Formatting. 
* src/GrampsWidgets.py (MonitoredMenu): Factor out commong code.


svn: r6280
 2006-04-06 21:28:19 +00:00
Don Allingham
bc96c75e39 remove missing recent files 
svn: r6279
 2006-04-06 16:50:05 +00:00
Don Allingham
0c0ac91881 default types for events 
svn: r6278
 2006-04-06 04:10:30 +00:00
Don Allingham
a3f8782e32 add family selector 
svn: r6277
 2006-04-06 03:35:19 +00:00
Don Allingham
20a55cdaa2 xml import/export with new lds scheme 
svn: r6276
 2006-04-06 02:34:58 +00:00
Don Allingham
1943138e42 gedcom import/export with new lds scheme 
svn: r6275
 2006-04-06 01:42:14 +00:00
Don Allingham
ac9501eed4 Fix place selecton on LDS ords 
svn: r6273
 2006-04-05 21:30:27 +00:00
Don Allingham
a817cb4a3d handle temple not set for LdsOrd 
svn: r6272
 2006-04-05 18:48:45 +00:00
Don Allingham
5c13395626 fix lds unserialize 
svn: r6271
 2006-04-05 17:15:44 +00:00
Brian Matherly
ed211a6aab Fix image handling problems for reports. 
svn: r6269
 2006-04-05 04:41:56 +00:00
Don Allingham
050c4e3f08 lds status type to a constant 
svn: r6268
 2006-04-05 04:16:16 +00:00
Alex Roitman
6e9bf848a2 Update 
svn: r6263
 2006-04-04 21:50:11 +00:00
Don Allingham
f3af587b75 Start of better LDS support 
svn: r6261
 2006-04-04 18:07:23 +00:00
Martin Hawlisch
82e6106da0 * src/plugins/TestcaseGenerator.py: Fix lds ord; Add new option to put a linebreak into each textfield 
svn: r6260
 2006-04-04 15:28:43 +00:00
Brian Matherly
d52f881814 minor report improvements 
svn: r6259
 2006-04-04 04:14:51 +00:00
Don Allingham
74d20665d7 place autocompletion 
svn: r6257
 2006-04-02 18:35:12 +00:00
Brian Matherly
cca50ad870 src/plugins/FamilyGroup.py: various fixes, add Marriage info 
svn: r6256
 2006-04-02 05:35:25 +00:00
Don Allingham
ae2486081d dbstate.active fixes 
svn: r6255
 2006-04-02 04:15:11 +00:00
Brian Matherly
9653c3e6de Narrative Web Page should work now 
svn: r6254
 2006-04-01 17:38:34 +00:00
Martin Hawlisch
206c8d5e1e * src/DisplayTabs.py (EventEmbedList.edit_button_clicked): Fix params of EditEventRef call 
svn: r6253
 2006-04-01 13:05:27 +00:00
Martin Hawlisch
08f0192af4 * src/DataViews/_PedigreeView.py: Work around the bug of dbstate.active not being updated when the active person was edited. 
svn: r6251
 2006-04-01 12:31:04 +00:00
Don Allingham
96c6a2b9b3 ManagedWindow 
svn: r6249
 2006-04-01 03:59:42 +00:00
Don Allingham
371c34ef1b remember custom attributes/events 
svn: r6248
 2006-03-31 23:46:34 +00:00
Don Allingham
6541f59986 restore lds baptism status values 
svn: r6244
 2006-03-31 20:01:46 +00:00
Don Allingham
c0162b0fce empty object checks 
svn: r6243
 2006-03-31 19:46:41 +00:00
Brian Matherly
76f214378f src/plugins/NavWebPage.py: various fixes. Doesn't work yet. 
svn: r6240
 2006-03-31 05:37:41 +00:00
Don Allingham
6c0e2b86d6 handle to ref conversions 
svn: r6239
 2006-03-31 04:19:06 +00:00
Brian Matherly
97ee7bdc17 src/plugins/DecendReport.py: use full dates instead of just year. 
svn: r6238
 2006-03-31 03:55:06 +00:00
Brian Matherly
ce463e546d src/plugins/GraphViz.py: import const 
svn: r6237
 2006-03-31 01:23:48 +00:00
Don Allingham
055bd53043 surname guessing 
svn: r6236
 2006-03-30 22:15:03 +00:00
Don Allingham
0813d57df6 check and repair fixes 
svn: r6235
 2006-03-30 17:29:30 +00:00
Don Allingham
da284dad8b autocompletion for surnames 
svn: r6234
 2006-03-30 16:29:59 +00:00
Don Allingham
0335638bf4 command handling 
svn: r6233
 2006-03-30 16:04:20 +00:00
Brian Matherly
d9277db7ee Remove use of deprecated functions. Supported graphical reports should work now. 
svn: r6232
 2006-03-30 05:15:54 +00:00
Brian Matherly
938096dfca src/PluginUtils/_Plugins.py: remove statbox 
svn: r6231
 2006-03-30 03:29:18 +00:00
Don Allingham
eb76d53d9e fix launch routine 
svn: r6230
 2006-03-30 03:24:04 +00:00
Brian Matherly
8a4302a1af Remove use of deprecated functions. Supported text reports now work. 
svn: r6229
 2006-03-30 03:17:33 +00:00
Don Allingham
16f06d787a fix import 
svn: r6227
 2006-03-30 01:57:34 +00:00
Don Allingham
071ae0ac9a dialog fixes, replace fork with spawn 
svn: r6226
 2006-03-29 22:51:27 +00:00
Don Allingham
9d13b0783d enable actiongroups on autoload 
svn: r6225
 2006-03-29 19:26:43 +00:00
Don Allingham
d49a5aa8ef SelectObject support 
svn: r6224
 2006-03-29 17:56:11 +00:00
Don Allingham
817ead70e4 fix place deletion 
svn: r6223
 2006-03-29 05:01:27 +00:00
Don Allingham
5218a9d125 remove 2.0.X warn message 
svn: r6221
 2006-03-29 04:48:50 +00:00
Don Allingham
4c3e96b163 remove expanduser 
svn: r6219
 2006-03-29 04:24:39 +00:00
Don Allingham
dcec2c11c9 remove expanduser 
svn: r6218
 2006-03-29 04:11:17 +00:00
Don Allingham
ae90bbe812 remove convert dependency 
svn: r6217
 2006-03-29 03:21:29 +00:00
Brian Matherly
1759eaf403 Make the Family Group Report work. Eliminiate the use of depricated functions. 
svn: r6216
 2006-03-29 02:35:19 +00:00
Brian Matherly
4813ce09d7 Use filename instead of URI for XML parser (works on Windows and Linux) 
svn: r6215
 2006-03-29 02:25:04 +00:00
Don Allingham
d9085cf219 default application selection 
svn: r6214
 2006-03-28 20:11:48 +00:00
Martin Hawlisch
a2e9b9ad51 * src/DataViews/_PedigreeView.py (_PersonWidget_base): Use other name for the drag_begin callback to not conflict with a gtk.Widget internal method. The DnD icon works now. 
svn: r6213
 2006-03-27 08:07:57 +00:00
Don Allingham
5b04d86d82 set drag and drop icon 
svn: r6212
 2006-03-27 05:06:10 +00:00
Martin Hawlisch
614a4a5e7d * src/DataViews/_PedigreeView.py: Open FamilyEditor to add missing parents 
svn: r6210
 2006-03-25 14:23:51 +00:00
Martin Hawlisch
6d2e8b34c9 * src/DataViews/_PedigreeView.py: Add DnD support to the person boxes (a person can now be dragged to the ScratshPad or to a text-editor); Menu entry to copy person data (rendered as text) into clipboard 
svn: r6209
 2006-03-25 13:36:05 +00:00
Don Allingham
d426390f39 Handle single parent families on add parent switch 
svn: r6207
 2006-03-25 03:47:47 +00:00
Don Allingham
8c47f5d582 added repository reference editor 
svn: r6206
 2006-03-25 03:07:20 +00:00
Don Allingham
af7c175eac handle add parent family switching 
svn: r6203
 2006-03-24 04:04:24 +00:00
Don Allingham
fbce343422 unknown parent label on FamilyViwe 
svn: r6201
 2006-03-23 21:51:42 +00:00
Don Allingham
8ca93e4c15 fix arglist 
svn: r6199
 2006-03-23 18:31:56 +00:00
Martin Hawlisch
989f859a5c Support for DnD of alternate locations of a place 
svn: r6198
 2006-03-23 16:41:51 +00:00
Brian Matherly
2301a20787 Filter double drag and drops in Windows. 
svn: r6197
 2006-03-23 06:10:45 +00:00
Don Allingham
6a432cf0a1 repository drag-n-drop 
svn: r6196
 2006-03-23 05:19:38 +00:00
Don Allingham
389fa7263e scratchpad/drag-n-drop fixes 
svn: r6194
 2006-03-22 23:03:57 +00:00
Martin Hawlisch
d6a44469e0 Add wrappers for displaying the tuple types to unify their usage. 
svn: r6193
 2006-03-22 21:19:32 +00:00
Don Allingham
936b073c02 family warn dialog 
svn: r6192
 2006-03-22 03:57:51 +00:00
Don Allingham
5d34cd3446 editor fixes 
svn: r6191
 2006-03-21 22:12:39 +00:00
Alex Roitman
253e31a47d * various: rename doc to data; move most of src/data to data. 
svn: r6187
 2006-03-21 18:56:27 +00:00
Don Allingham
0328a4a943 .ini settings 
svn: r6186
 2006-03-21 06:33:59 +00:00
Don Allingham
e6f0bf7dda lds specific data moved 
svn: r6185
 2006-03-21 06:23:45 +00:00
Brian Matherly
932025dfda os independent path 
svn: r6184
 2006-03-21 03:01:50 +00:00
Don Allingham
7d884a7aa6 update data properly 
svn: r6183
 2006-03-21 02:39:01 +00:00
Don Allingham
312560a6ef use db.THREAD 
svn: r6182
 2006-03-21 00:05:07 +00:00
Don Allingham
0742d69347 performance enhancements 
svn: r6179
 2006-03-19 23:34:23 +00:00
Don Allingham
56e93152d4 object sharing support 
svn: r6178
 2006-03-19 06:49:03 +00:00
Alex Roitman
4dbe382a67 * configure.in: Remove scrollkeeper checks and other unused statements 
svn: r6177
 2006-03-19 06:03:04 +00:00
Don Allingham
43c775b975 removed RelImage 
svn: r6176
 2006-03-19 03:50:47 +00:00
Don Allingham
32bfafecc9 speed improvements until object selector is functional 
svn: r6175
 2006-03-19 03:25:31 +00:00
Alex Roitman
e7359fe941 * intltool-*.in: remove from svn. 
svn: r6172
 2006-03-18 07:47:53 +00:00
Don Allingham
94686d5e25 use SelectPerson for father instead of Object Selector 
svn: r6171
 2006-03-18 05:47:39 +00:00
Don Allingham
50f00d12cb removal of families 
svn: r6169
 2006-03-18 01:30:23 +00:00
Alex Roitman
5fc44d4627 * help: add new dir with new gnome-doc-utils infrastructure. 
svn: r6163
 2006-03-17 20:41:14 +00:00
Alex Roitman
9577aba0bf * configure.in: Multiple improvements. 
* config.guess, config.sub: newer versions.
	* autogen.sh: Better gnome-common message.
	* src/TipOfDay.py (TipParser): skip messages with xml:lang
	attribute, because these are already supplied in the po file.


svn: r6162
 2006-03-17 19:15:16 +00:00
Alex Roitman
93add4967a * various: Use TransUtils.sgettext instead of gettext.gettext to work out stripping the context. 
svn: r6155
 2006-03-16 20:24:27 +00:00
Alex Roitman
488bfb3a7b Remove py-compile 
svn: r6153
 2006-03-16 19:09:16 +00:00
Alex Roitman
94a5f98277 Update 
svn: r6152
 2006-03-16 19:02:45 +00:00
Alex Roitman
c6ea05e24d * various: intltoolize and gettextize properly. 
svn: r6144
 2006-03-15 23:58:23 +00:00
Alex Roitman
87b930dbae * src/GrampsDb/_GrampsBSDDB.py (update_empty,update_real): Add 
functions for updating the display;
	(gramps_upgrade): Set up display updaters;
	(gramps_upgrade_9): Reflect progess of db upgrade.
	(low_level_9): Return status and length of the db.
	(_table_low_level_9): Return table length if successful.
	* src/ViewManager.py (post_load): Remove database upgrade, since
	db.load takes care of upgrade.


svn: r6143
 2006-03-14 19:49:34 +00:00
Alex Roitman
9159ead0ad * src/RelLib/_NoteBase.py (NoteBase.serialize): Work out the case of note being None -- leftover from gramps20. 
svn: r6142
 2006-03-14 03:46:54 +00:00
Alex Roitman
4da2ebca24 * src/PluginUtils/_ReportOptions.py: Use correct namespace for the base clases from _Options module. 
svn: r6139
 2006-03-12 04:13:23 +00:00
Alex Roitman
44040b095a Remove dependency on load_plugins 
svn: r6136
 2006-03-11 04:58:58 +00:00
Don Allingham
598e518474 fix map view startup traceback 
svn: r6135
 2006-03-11 04:42:49 +00:00
Alex Roitman
6b9d4207ce * src/Plugins.py, src/PluginMgr.py: Move to ReportUtils. 
svn: r6133
 2006-03-11 01:12:06 +00:00
Don Allingham
9d086fd022 add remove function in FamilyView 
svn: r6132
 2006-03-10 22:57:22 +00:00
Don Allingham
76d3f3daa1 add remove function in FamilyView 
svn: r6131
 2006-03-10 22:38:45 +00:00
Don Allingham
1be12a4da0 icon fixes 
svn: r6129
 2006-03-10 21:05:00 +00:00
Don Allingham
e338c13d75 MediaView integrity after add 
svn: r6127
 2006-03-10 04:29:08 +00:00
Don Allingham
99cd0fe2dc Fix adding of places in internal map 
svn: r6126
 2006-03-10 03:26:21 +00:00
Don Allingham
1c147b3cd3 commit places properly 
svn: r6125
 2006-03-10 02:46:19 +00:00
Don Allingham
064ad83c6a add/delete families better 
svn: r6124
 2006-03-09 22:37:19 +00:00
Alex Roitman
bd67a5ec84 * PluginUtils: Add module with Report and Tool utils. 
svn: r6121
 2006-03-09 20:49:29 +00:00