Commit Graph

218 Commits

Author SHA1 Message Date
Eelco Dolstra
eb4b1e8b04 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26141
2011-03-03 12:02:50 +00:00
Ludovic Courtès
ca1aa628b9 GNU FreeIPMI 1.0.2.
svn path=/nixpkgs/trunk/; revision=26084
2011-02-23 21:24:37 +00:00
Yury G. Kudryashov
dae53e0ea6 Make gdmap compile with newer gtk
svn path=/nixpkgs/branches/x-updates/; revision=25922
2011-02-12 20:16:08 +00:00
Ludovic Courtès
7e9aa0366f GNU ddrescue 1.14.
svn path=/nixpkgs/trunk/; revision=25683
2011-01-24 22:29:19 +00:00
Michael Raskin
f863b73829 Adding FreeIPMI
svn path=/nixpkgs/trunk/; revision=25679
2011-01-24 07:06:17 +00:00
Michael Raskin
618e45c0f3 Adding ipmiutil
svn path=/nixpkgs/trunk/; revision=25660
2011-01-21 19:15:10 +00:00
Michael Raskin
e7cb1ea803 Update plan9port to make it build
svn path=/nixpkgs/trunk/; revision=25496
2011-01-10 19:41:58 +00:00
Lluís Batlle i Rossell
3fed0dff5d Telling fakeroot to build only on linux
svn path=/nixpkgs/trunk/; revision=25441
2011-01-06 10:51:10 +00:00
Lluís Batlle i Rossell
eb3d75b740 Adding fakeroot.
svn path=/nixpkgs/trunk/; revision=25440
2011-01-06 10:43:32 +00:00
Ludovic Courtès
5ce453b66e GNU acct 6.5.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25083
2010-12-12 20:19:43 +00:00
Lluís Batlle i Rossell
ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Peter Simons
9bd9e32aa8 pkgs/tools/system/ipmitool: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25014
2010-12-06 18:01:57 +00:00
Lluís Batlle i Rossell
e571333232 Making ts and tm crossbuild
svn path=/nixpkgs/branches/stdenv-updates/; revision=24870
2010-11-26 14:12:10 +00:00
Michael Raskin
6a9414d938 Adding dd_rescue - this is not the same as GNU ddrescue which has not been updated for a long time
svn path=/nixpkgs/trunk/; revision=24801
2010-11-22 08:40:10 +00:00
Michael Raskin
4c4b783a10 Fix typo
svn path=/nixpkgs/trunk/; revision=24703
2010-11-15 20:36:50 +00:00
Evgeny Egorochkin
ecf54a3e6b lshw: disable gui by default since it's ugly.
svn path=/nixpkgs/trunk/; revision=24689
2010-11-15 10:12:55 +00:00
Evgeny Egorochkin
b9b7665edd lshw: Packaged
svn path=/nixpkgs/trunk/; revision=24688
2010-11-15 09:52:57 +00:00
Peter Simons
027f42695c The lxc package doesn't build on systems other than Linux.
svn path=/nixpkgs/trunk/; revision=24608
2010-11-05 14:49:42 +00:00
Lluís Batlle i Rossell
1d4fe44ecc Tell lxc to use /var instead of $out/var
svn path=/nixpkgs/trunk/; revision=24551
2010-10-31 19:25:51 +00:00
Lluís Batlle i Rossell
fdc0738e0b Adding lxc userland tools.
svn path=/nixpkgs/trunk/; revision=24502
2010-10-26 21:11:47 +00:00
Lluís Batlle i Rossell
710f6c165b Making the vixie cron have a configurable sendmail path (for nixos)
svn path=/nixpkgs/trunk/; revision=24196
2010-10-10 11:07:15 +00:00
Yury G. Kudryashov
cb623539b0 Add sg3_utils
svn path=/nixpkgs/trunk/; revision=23949
2010-09-26 19:39:42 +00:00
Ludovic Courtès
db61930195 GNU ddrescue 1.13.
svn path=/nixpkgs/trunk/; revision=23648
2010-09-05 15:19:12 +00:00
Eelco Dolstra
4bf5b0d36b * Fix some more "args: with args".
svn path=/nixpkgs/trunk/; revision=22828
2010-07-30 14:47:23 +00:00
Eelco Dolstra
907bb1aac6 * ltrace: updated to 0.5.3.
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
2010-07-29 18:55:16 +00:00
Eelco Dolstra
ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency.
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
2010-07-29 08:21:21 +00:00
Eelco Dolstra
2f6c7cd3dd * Latest pciutils and usbutils, along with the latest PCI and USB IDs.
svn path=/nixpkgs/branches/x-updates/; revision=22687
2010-07-21 12:01:57 +00:00
Ludovic Courtès
05dd21d4fb GNU mcron 1.0.6.
svn path=/nixpkgs/trunk/; revision=22464
2010-07-04 21:11:08 +00:00
Lluís Batlle i Rossell
cf5343a07d Adding the logrotate I found in the freebsd ports.
I think that is what debian, fedora and freebsd call 'logrotate'.

svn path=/nixpkgs/trunk/; revision=21437
2010-04-29 17:55:06 +00:00
Ludovic Courtès
5ed6e1a1f7 GNU ddrescue 1.12.
svn path=/nixpkgs/trunk/; revision=21051
2010-04-13 08:56:07 +00:00
Yury G. Kudryashov
f25c68f01a Remove old kde packages
svn path=/nixpkgs/trunk/; revision=21011
2010-04-11 15:50:41 +00:00
Lluís Batlle i Rossell
d213d290a6 Setting tm and ts to build in all nixpkgs platforms.
svn path=/nixpkgs/trunk/; revision=20446
2010-03-05 23:26:49 +00:00
Lluís Batlle i Rossell
81d4c5d09b Updating ts
svn path=/nixpkgs/trunk/; revision=20421
2010-03-05 17:22:37 +00:00
Rob Vermaas
0fd4468570 acct: updated hash
svn path=/nixpkgs/trunk/; revision=20299
2010-03-01 12:11:12 +00:00
Lluís Batlle i Rossell
e668d2689e Adding 'gt5', a diff-capable 'du' browser
svn path=/nixpkgs/trunk/; revision=20236
2010-02-24 19:06:25 +00:00
Ludovic Courtès
66e7aaa5c7 GNU Acct 6.5.4.
svn path=/nixpkgs/trunk/; revision=19945
2010-02-12 09:07:19 +00:00
Ludovic Courtès
9be35372dc GNU Acct 6.5.3.
svn path=/nixpkgs/trunk/; revision=19934
2010-02-11 14:48:34 +00:00
Peter Simons
715c59b281 pkgs/tools/system/ipmitool: added optional support for generating statically linked binaries
svn path=/nixpkgs/trunk/; revision=19778
2010-02-03 12:47:31 +00:00
Peter Simons
c261d7a847 pkgs/tools/system/ipmitool: updated to version 1.8.11
svn path=/nixpkgs/trunk/; revision=19777
2010-02-03 12:47:23 +00:00
Peter Simons
35424c8836 pkgs/tools/system/ipmitool/default.nix: add openssl dependency to enable lanplus protocol
svn path=/nixpkgs/trunk/; revision=19543
2010-01-19 16:21:40 +00:00
Peter Simons
81324b5de0 pkgs/tools/system/ipmitool: command-line interface to IPMI-enabled devices
Initial version 1.8.9.

svn path=/nixpkgs/trunk/; revision=19542
2010-01-19 15:58:19 +00:00
Lluís Batlle i Rossell
ca167b9a97 Updating 'at' from 3.1.11 to 3.1.12.
The debian repository only has 3.1.10 and 3.1.12. I don't know why.


svn path=/nixpkgs/trunk/; revision=19480
2010-01-16 14:44:20 +00:00
Ludovic Courtès
55c103a37e GNU Fdisk 1.2.4.
svn path=/nixpkgs/trunk/; revision=19347
2010-01-11 10:16:47 +00:00
Lluís Batlle i Rossell
931f6655f0 Fixing the filelight 1.0 expression (kde3), so it builds again.
svn path=/nixpkgs/trunk/; revision=18571
2009-11-23 21:15:15 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell
c22d173893 Adding the bootchart capture script. It worked for me, run standalone, not as init.
I tried their website renderer, but it did not work for me. It may be shut down,
because their last update is for 2006.
Next steps: put it into nixos, and build the renderer (java!).

svn path=/nixpkgs/trunk/; revision=18041
2009-10-29 23:15:10 +00:00
Michael Raskin
e618a80968 Adding vbetool
svn path=/nixpkgs/trunk/; revision=17952
2009-10-24 19:58:07 +00:00
Lluís Batlle i Rossell
14433eb1e2 Updating ts to 0.6.5
svn path=/nixpkgs/trunk/; revision=17621
2009-10-02 19:05:29 +00:00
Lluís Batlle i Rossell
c66b4ee26d Updating freeimage, and setting me as maintainer on some packages.
svn path=/nixpkgs/trunk/; revision=17584
2009-10-02 07:39:03 +00:00
Ludovic Courtès
ffa5a96874 GNU Parted: Don't try non-Linux platforms.
svn path=/nixpkgs/trunk/; revision=17226
2009-09-17 10:42:27 +00:00
Ludovic Courtès
18ca37341b GNU Acct: Don't build on Cygwin.
svn path=/nixpkgs/trunk/; revision=17225
2009-09-17 10:35:05 +00:00
Ludovic Courtès
26bf0b0150 Fix GNU Fdisk.
svn path=/nixpkgs/trunk/; revision=17195
2009-09-16 14:30:53 +00:00
Rob Vermaas
8afb39344e * added uptimed 0.3.16
svn path=/nixpkgs/trunk/; revision=17172
2009-09-16 07:31:16 +00:00
Ludovic Courtès
d185972f22 Add GNU Accounting Utilities.
svn path=/nixpkgs/trunk/; revision=16981
2009-09-08 08:29:40 +00:00
Michael Raskin
f16657b14f Adding monit monitoring tool; in the course of action creating a script to auto-prepare basic autoupdate layout
svn path=/nixpkgs/trunk/; revision=16863
2009-08-26 16:22:20 +00:00
Eelco Dolstra
0c86d710fe * Make sure that the pid file is placed in /var/run.
svn path=/nixpkgs/trunk/; revision=16794
2009-08-20 23:57:33 +00:00
Eelco Dolstra
d937a1bae0 * at 3.1.11.
svn path=/nixpkgs/trunk/; revision=16793
2009-08-20 23:40:50 +00:00
Eelco Dolstra
604d42d560 * pciutils: updated the pci.ids database. Don't compress it anymore
because the latest udev wants an uncompressed version.

svn path=/nixpkgs/trunk/; revision=16679
2009-08-11 20:44:35 +00:00
Eelco Dolstra
64b833face * smartmontools updated to 5.38.
svn path=/nixpkgs/trunk/; revision=16635
2009-08-10 06:44:08 +00:00
Ludovic Courtès
c3943258ce Add GNU fdisk.
svn path=/nixpkgs/trunk/; revision=16626
2009-08-09 22:15:40 +00:00
Michael Raskin
b69be987c0 Added setuid-ready chroot utility.
svn path=/nixpkgs/trunk/; revision=16331
2009-07-12 08:10:51 +00:00
Michael Raskin
2b68672d1c Setserial source fix
svn path=/nixpkgs/trunk/; revision=15933
2009-06-11 05:41:30 +00:00
Michael Raskin
1b5fa6e1ee Adding setserial
svn path=/nixpkgs/trunk/; revision=15898
2009-06-09 04:22:46 +00:00
Ludovic Courtès
644cf259a5 Add GNU mcron, a `cron' implementation in Guile Scheme.
svn path=/nixpkgs/trunk/; revision=14870
2009-04-03 18:46:26 +00:00
Lluís Batlle i Rossell
67b73b3cbb Fixing the url for plan9port (Dankon Ludo!)
svn path=/nixpkgs/trunk/; revision=14679
2009-03-24 09:21:21 +00:00
Lluís Batlle i Rossell
1167cdd1ba Adding plan9port with X11 support.
For acme to work, set the PLAN9 variable, and have the plan9port programs in the PATH.

svn path=/nixpkgs/trunk/; revision=14669
2009-03-23 21:31:30 +00:00
Eelco Dolstra
29daeec109 * pciutils: build a shared libpci.
* pciutils: updated to the latest pci.ids.

svn path=/nixpkgs/trunk/; revision=14490
2009-03-10 12:25:45 +00:00
Eelco Dolstra
fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Lluís Batlle i Rossell
704e085bfc Updating ts version.
svn path=/nixpkgs/trunk/; revision=14150
2009-02-21 17:57:37 +00:00
Lluís Batlle i Rossell
39cea05305 Updating task spooler from 0.6.2 to 0.6.3.
svn path=/nixpkgs/trunk/; revision=14120
2009-02-18 22:45:01 +00:00
Marc Weber
f3aee4d107 at version bump to 3.1.10.2
svn path=/nixpkgs/trunk/; revision=14078
2009-02-13 18:06:25 +00:00
Eelco Dolstra
6ed4aa7ecb * Qt updated to 4.4.3 in preparation of upgrading KDE to 4.2.
svn path=/nixpkgs/trunk/; revision=13974
2009-02-03 16:32:56 +00:00
Armijn Hemel
6aebc2b1a7 version bump to 2.20
svn path=/nixpkgs/trunk/; revision=13929
2009-02-01 18:56:01 +00:00
Michael Raskin
b9b8abb1cb Removing unnecessary sed invokation for ts - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13699
2009-01-04 17:21:29 +00:00
Michael Raskin
8f4c32886a Updated ts task spooler; patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13687
2009-01-02 16:33:39 +00:00
Marc Weber
79536f8240 fix fcron: don't check for /var/setuid-wrappers/sendmail
svn path=/nixpkgs/trunk/; revision=13435
2008-11-26 14:38:16 +00:00
Michael Raskin
044c4dfe9f Fix shebang in more scripts...
svn path=/nixpkgs/trunk/; revision=13393
2008-11-24 22:36:39 +00:00
Marc Weber
6fb6ecff1e fix fcron: don't try to create /etc/fcron.{allow,deny,conf}
svn path=/nixpkgs/trunk/; revision=13391
2008-11-24 22:30:58 +00:00
Marc Weber
26212b62c7 (last) fcron fix for now because the service works as expected
svn path=/nixpkgs/trunk/; revision=13368
2008-11-22 16:57:31 +00:00
Marc Weber
eb0f06a162 default locations for fcron config settings (don't use store path)
svn path=/nixpkgs/trunk/; revision=13366
2008-11-21 23:53:31 +00:00
Marc Weber
b9173d8755 added fcron
svn path=/nixpkgs/trunk/; revision=13192
2008-11-04 21:40:39 +00:00
Michael Raskin
c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00
Eelco Dolstra
562345e595 * pciutils updated to 3.0.0. Also latest pci.ids.
svn path=/nixpkgs/trunk/; revision=12773
2008-08-30 09:56:21 +00:00
Eelco Dolstra
cee9051b7c * Get rid of $findUnpacker, it's pointless anyway.
* Pass the source file to $unpackCmd via $curSrc.

svn path=/nixpkgs/trunk/; revision=12748
2008-08-27 15:22:33 +00:00
Marc Weber
3091c81082 tm (terminal mixer), ts (task spooler) added, provided by viric
svn path=/nixpkgs/trunk/; revision=12688
2008-08-21 21:35:14 +00:00
Michael Raskin
87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
2008-08-19 05:54:09 +00:00
Michael Raskin
c888ed7499 Added updated gdmap
svn path=/nixpkgs/trunk/; revision=12115
2008-06-16 11:11:56 +00:00
Ludovic Courtès
aa720c8431 Add At, the classical Unix command scheduler.
svn path=/nixpkgs/trunk/; revision=11434
2008-04-01 09:08:17 +00:00
Michael Raskin
fa40aa96f5 Added ddrescue
svn path=/nixpkgs/trunk/; revision=11320
2008-03-28 11:59:50 +00:00
Michael Raskin
71f8e0911a Added src to meta for builderDefs-based packages.
svn path=/nixpkgs/trunk/; revision=10913
2008-03-02 18:49:31 +00:00
Eelco Dolstra
e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
2008-02-20 23:02:41 +00:00
Michael Raskin
2a087141cb Ported replace renaming to replace-literal to avoid conflict with MySQL package supplying own tool with name replace.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10704
2008-02-15 11:14:40 +00:00
Yury G. Kudryashov
da57804fff Merged with trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
2008-01-23 18:11:03 +00:00
Michael Raskin
e2c0809777 fixed "which" src
svn path=/nixpkgs/trunk/; revision=10235
2008-01-20 22:55:43 +00:00
Armijn Hemel
aa275908c0 which:
* update to 2.19
* add readline dependency
* use mirror:// for download location

svn path=/nixpkgs/trunk/; revision=10231
2008-01-20 18:23:55 +00:00
Eelco Dolstra
8215b6c953 * pciutils 2.2.8, with the latest pci.ids.
svn path=/nixpkgs/trunk/; revision=10218
2008-01-18 14:39:24 +00:00
Michael Raskin
bc46eaf404 Some review of builder-defs and dependent files. No rebuild needed. Now it should be possible to override elements in builderDefs
svn path=/nixpkgs/trunk/; revision=10214
2008-01-18 12:36:56 +00:00
Yury G. Kudryashov
8515c17966 Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes.
svn path=/nixpkgs/branches/stdenv-updates/; revision=9893
2007-12-08 01:10:32 +00:00
Yury G. Kudryashov
6281ec3eb8 fix name (was 2.16, should have been 2.17)
svn path=/nixpkgs/branches/stdenv-updates/; revision=9890
2007-12-08 01:09:57 +00:00
Michael Raskin
1bbc6fe55a Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes.
svn path=/nixpkgs/trunk/; revision=9812
2007-12-01 16:20:23 +00:00
Armijn Hemel
1589f14709 fix name (was 2.16, should have been 2.17)
svn path=/nixpkgs/trunk/; revision=9806
2007-11-28 18:31:37 +00:00
Armijn Hemel
614a3b47c6 update to 2.17
svn path=/nixpkgs/trunk/; revision=9499
2007-10-20 17:39:28 +00:00
Eelco Dolstra
8d4986e2e8 * Added smartmontools.
svn path=/nixpkgs/trunk/; revision=9466
2007-10-18 13:05:43 +00:00
Eelco Dolstra
8f4d8573c0 * Fix a bunch of URLs.
svn path=/nixpkgs/trunk/; revision=9292
2007-09-11 10:15:07 +00:00
Eelco Dolstra
d39fd2a578 * Rewrite all the kernel.org URLs to mirror://kernel/.
svn path=/nixpkgs/trunk/; revision=9202
2007-08-27 13:59:40 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Michael Raskin
9e8cc9787e Added Filelight - a tool to quickly find disk eating files/directories.
svn path=/nixpkgs/trunk/; revision=8983
2007-07-14 14:41:06 +00:00
Armijn Hemel
605ddb67d7 2.2.4 -> 2.2.5
svn path=/nixpkgs/trunk/; revision=8688
2007-05-14 10:52:00 +00:00
Eelco Dolstra
a106e7a1d7 * Use the latest pci.ids.
svn path=/nixpkgs/trunk/; revision=8047
2007-02-26 12:07:46 +00:00
Eelco Dolstra
b8057ff11a * Latest pciutils.
svn path=/nixpkgs/trunk/; revision=7914
2007-02-19 20:18:20 +00:00
Eelco Dolstra
2f7c9b8fe2 * Added cron.
svn path=/nixpkgs/trunk/; revision=7618
2007-01-10 15:44:58 +00:00
Eelco Dolstra
94fe7734fa * Glibc 2.3.6.
* GCC 3.4.5.
* Updated several other stdenv packages.
* Modified the builders of several packages to use the generic
  builder.

svn path=/nixpkgs/trunk/; revision=4336
2005-12-06 00:12:45 +00:00
Eelco Dolstra
82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Visser
02a743eb7a junk
svn path=/nixpkgs/trunk/; revision=598
2003-12-23 21:32:25 +00:00
Eelco Visser
b4ce40af2b added packages: which, libtool
aggregation in all-packages-generic: autotools
building strategoxt from svn

not complete yet since autconf cannot find libtool


svn path=/nixpkgs/trunk/; revision=596
2003-12-23 20:51:58 +00:00