Commit graph

331 commits

Author SHA1 Message Date
Sander van der Burg
4597b33ed1 Update Disnix packages to use the 0.1 release
svn path=/nixpkgs/trunk/; revision=20915
2010-04-01 14:49:05 +00:00
Andres Löh
9370225663 Haskell Platform 2010.1.0.0
svn path=/nixpkgs/trunk/; revision=20904
2010-04-01 10:56:48 +00:00
Eelco Dolstra
8396168276 * Updated Nix to 0.15.
svn path=/nixpkgs/trunk/; revision=20697
2010-03-17 12:16:03 +00:00
Eelco Dolstra
8ff6ffbb65 * Update the unstable Nix (with some GC-related bug fixes).
svn path=/nixpkgs/trunk/; revision=20652
2010-03-16 12:46:12 +00:00
Eelco Dolstra
2c44e4313c svn path=/nixpkgs/trunk/; revision=20570 2010-03-11 16:22:55 +00:00
Ludovic Courtès
9c2c2af4b2 Latest Nix from `trunk'.
svn path=/nixpkgs/trunk/; revision=20568
2010-03-11 16:10:06 +00:00
Eelco Dolstra
2745223414 * Updated nixSqlite.
svn path=/nixpkgs/trunk/; revision=20552
2010-03-11 11:36:40 +00:00
Ludovic Courtès
62a4d66a48 Fix URL of `nixUnstable'.
svn path=/nixpkgs/trunk/; revision=20551
2010-03-11 11:15:58 +00:00
Ludovic Courtès
c22cc79a9e Latest Nix from `trunk'.
svn path=/nixpkgs/trunk/; revision=20549
2010-03-11 10:51:53 +00:00
Eelco Dolstra
854b22a24e * Updated nixSqlite.
svn path=/nixpkgs/trunk/; revision=20520
2010-03-10 09:58:19 +00:00
Lluís Batlle i Rossell
997723ec9b Trying to make nixUnstable cross-build.
It fails because it builds bin2c for the host system, instead of the build system.
I will wait for a fix upstream.

svn path=/nixpkgs/trunk/; revision=20445
2010-03-05 23:22:36 +00:00
Eelco Dolstra
2ae55812ef svn path=/nixpkgs/trunk/; revision=20428 2010-03-05 18:29:56 +00:00
Rob Vermaas
cb4a352b3e wrong hash for nix-mysqlite 0.15
svn path=/nixpkgs/trunk/; revision=20411
2010-03-05 13:15:03 +00:00
Rob Vermaas
0723777cc7 update nixSqlite to 0.15pre20408
svn path=/nixpkgs/trunk/; revision=20410
2010-03-05 13:09:33 +00:00
Eelco Dolstra
2880af03c8 * Add a Nix expression for the Nix SQLite branch (temporarily).
svn path=/nixpkgs/trunk/; revision=20377
2010-03-04 14:39:47 +00:00
Eelco Dolstra
10cb305f11 * Urgh.
svn path=/nixpkgs/trunk/; revision=20339
2010-03-02 16:33:35 +00:00
Eelco Dolstra
42d9c2e92a svn path=/nixpkgs/trunk/; revision=20338 2010-03-02 16:33:17 +00:00
Rob Vermaas
c4332bb7a1 nix 0.15pre20231 as nixUnstable
svn path=/nixpkgs/trunk/; revision=20243
2010-02-25 10:01:33 +00:00
Eelco Dolstra
8b5d0c8de5 * Updated checkinstall 1.6.2, and added a patch to make it compile on
Glibc 2.11.

svn path=/nixpkgs/trunk/; revision=19868
2010-02-08 15:39:51 +00:00
Eelco Dolstra
aee659e1e2 * Fix various broken URLs / mirrors.
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
2010-02-05 22:00:51 +00:00
Eelco Dolstra
874b4869a3 * Nix stable updated to 0.14.
svn path=/nixpkgs/trunk/; revision=19830
2010-02-05 10:41:24 +00:00
Eelco Dolstra
031f722394 svn path=/nixpkgs/trunk/; revision=19773 2010-02-03 10:56:10 +00:00
Eelco Dolstra
e80d65426f * Nix 0.14pre19730.
svn path=/nixpkgs/trunk/; revision=19733
2010-01-29 15:55:03 +00:00
Eelco Dolstra
10ca771495 * Latest Nix.
svn path=/nixpkgs/trunk/; revision=19653
2010-01-25 17:39:33 +00:00
Eelco Dolstra
ed3603d46f svn path=/nixpkgs/trunk/; revision=19034 2009-12-18 13:51:45 +00:00
Marc Weber
fdd2d5cb2a remove nixRepositoryManager. It can be installed using the haskell-nix-overlay
svn path=/nixpkgs/trunk/; revision=18898
2009-12-11 13:58:34 +00:00
Eelco Dolstra
d869913b27 * RPM updated to 4.7.2.
* nspr updated to 4.8.2.
* nss updated to 3.12.4.
* elfutils updated to 0.143.

svn path=/nixpkgs/trunk/; revision=18867
2009-12-09 22:34:51 +00:00
Eelco Dolstra
06b135ebf8 svn path=/nixpkgs/trunk/; revision=18865 2009-12-09 21:41:19 +00:00
Eelco Dolstra
f52952e504 * Nix updated to nix-0.14pre18592.
svn path=/nixpkgs/trunk/; revision=18594
2009-11-24 14:19:20 +00:00
Eelco Dolstra
ade60645af * Nix 0.13.
svn path=/nixpkgs/trunk/; revision=18175
2009-11-05 23:47:53 +00:00
Eelco Dolstra
7b8a785497 svn path=/nixpkgs/trunk/; revision=18061 2009-11-01 14:01:05 +00:00
Marc Weber
a5fdba90e2 reverting -r17404 - the patch I should have kept private
svn path=/nixpkgs/trunk/; revision=17408
2009-09-24 21:39:32 +00:00
Marc Weber
4d41884f8e nixUnstable: adding experimental debug coercion failure patch - for debugging only
svn path=/nixpkgs/trunk/; revision=17405
2009-09-24 18:22:30 +00:00
Eelco Dolstra
27ada9a525 svn path=/nixpkgs/trunk/; revision=17374 2009-09-23 20:02:44 +00:00
Marc Weber
88e66ae7f4 rename mapRecordFlatten to mapAttrsFlatten
svn path=/nixpkgs/trunk/; revision=17315
2009-09-20 21:54:20 +00:00
Michael Raskin
50c69a093c Building Nix from SVN now needs libxml2
svn path=/nixpkgs/trunk/; revision=17273
2009-09-19 11:40:36 +00:00
Eelco Dolstra
a727aa8d8b * Fix the broken Glibc version check.
svn path=/nixpkgs/trunk/; revision=17251
2009-09-18 15:02:19 +00:00
Eelco Dolstra
0852ef4da2 svn path=/nixpkgs/trunk/; revision=17233 2009-09-17 17:43:20 +00:00
Marc Weber
4800303718 nixUnstable: allow passing patches
svn path=/nixpkgs/trunk/; revision=17022
2009-09-10 16:57:37 +00:00
Sander van der Burg
c9254649c0 Added Disnix activation scripts package
svn path=/nixpkgs/trunk/; revision=16928
2009-09-02 10:03:45 +00:00
Sander van der Burg
d573d5f621 Upgraded disnix package to SVN revision 16924
svn path=/nixpkgs/trunk/; revision=16927
2009-09-02 09:47:47 +00:00
Michael Raskin
d0443c07fc Temporarily removing by-meta build and updating Nix..
svn path=/nixpkgs/trunk/; revision=16884
2009-08-28 06:37:05 +00:00
Eelco Dolstra
aba7c58eb5 svn path=/nixpkgs/trunk/; revision=16563 2009-08-03 13:53:44 +00:00
Marc Weber
f38e400515 basing nix-repository-manager on haskellPackages. The executable is no
longer recompiled when the config changes only

svn path=/nixpkgs/trunk/; revision=16297
2009-07-09 22:24:05 +00:00
Eelco Dolstra
506e86d2ea svn path=/nixpkgs/trunk/; revision=16266 2009-07-09 09:50:40 +00:00
Eelco Dolstra
83b7873495 * Latest unstable Nix.
svn path=/nixpkgs/trunk/; revision=16265
2009-07-09 09:50:20 +00:00
Eelco Dolstra
c36d75a40a * Latest unstable Nix.
svn path=/nixpkgs/trunk/; revision=15735
2009-05-26 16:25:41 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Eelco Dolstra
564d96042a * RPM barfs if you don't build its static libraries - probably a
Makefile bug.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15262
2009-04-23 09:55:52 +00:00
Eelco Dolstra
fd6de46f40 svn path=/nixpkgs/branches/stdenv-updates/; revision=15259 2009-04-22 23:08:25 +00:00
Eelco Dolstra
f70b4763bb svn path=/nixpkgs/trunk/; revision=15245 2009-04-22 13:13:55 +00:00
Andres Löh
35ac416328 More Haskell platform packages.
svn path=/nixpkgs/trunk/; revision=15151
2009-04-19 13:21:40 +00:00
Eelco Dolstra
95749f29f0 * Latest Nix unstable.
svn path=/nixpkgs/trunk/; revision=15075
2009-04-16 09:06:23 +00:00
Eelco Dolstra
a4c304ef84 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
2009-04-15 13:25:01 +00:00
Eelco Dolstra
6a18dcab44 * checkinstall: don't include directories in the Debian `conffiles'
file.  This caused the Nix Debian build to fail (because it installs
  a file /etc/profile.d/nix.sh).

svn path=/nixpkgs/trunk/; revision=15038
2009-04-14 14:57:31 +00:00
Eelco Dolstra
d27514cb28 * Sync with the trunk once more.
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
Eelco Dolstra
3c381aa734 * Also handle the __open_2() function, which is needed on x86_64.
* Renamed to patch, because these aren't syscalls but Glibc functions.

svn path=/nixpkgs/trunk/; revision=14742
2009-03-27 21:49:46 +00:00
Eelco Dolstra
96392cc45f * Added a patch that implements the getxattr(), lgetxattr() and
__open64_2() functions.  The latter in particular is needed to make
  operations like `mkdir -p /usr/foo/bar' work on Ubuntu 8.10 (Glibc
  2.8).

svn path=/nixpkgs/trunk/; revision=14741
2009-03-27 17:49:19 +00:00
Eelco Dolstra
b741451a17 * Checkinstall only works on Linux.
svn path=/nixpkgs/trunk/; revision=14740
2009-03-27 14:25:00 +00:00
Eelco Dolstra
7a0f6b1a40 * Patched checkinstall to include empty directory in packages.
svn path=/nixpkgs/trunk/; revision=14736
2009-03-27 14:13:23 +00:00
Eelco Dolstra
8fffed2ba1 * Use the latest checkinstall from git. This fixes /usr/bin/ld and
other paths incorrectly ending up in generated Deb files.

svn path=/nixpkgs/trunk/; revision=14735
2009-03-27 12:13:11 +00:00
Eelco Dolstra
5322285f97 * Bump.
svn path=/nixpkgs/trunk/; revision=14725
2009-03-26 13:39:40 +00:00
Eelco Dolstra
5b89240b84 * Bump.
svn path=/nixpkgs/trunk/; revision=14698
2009-03-25 12:41:13 +00:00
Eelco Dolstra
e49b111aca * Bump.
svn path=/nixpkgs/trunk/; revision=14686
2009-03-24 15:10:27 +00:00
Eelco Dolstra
3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Eelco Dolstra
5c7cd50c25 * Latest unstable version.
svn path=/nixpkgs/trunk/; revision=14465
2009-03-09 15:27:23 +00:00
Marc Weber
b288a02e9a nixUnstable version bump to 0.13pre14314
svn path=/nixpkgs/trunk/; revision=14326
2009-03-04 12:08:56 +00:00
Marc Weber
62a0aafa04 nixUnstable version bump to 0.13pre13641
svn path=/nixpkgs/trunk/; revision=14325
2009-03-04 12:08:51 +00:00
Eelco Dolstra
7c45744373 * Urhg. Dpkg releases tend to just disappear...
svn path=/nixpkgs/trunk/; revision=14203
2009-02-23 11:53:31 +00:00
Eelco Dolstra
e8a9844354 svn path=/nixpkgs/branches/stdenv-updates/; revision=13902 2009-01-29 16:08:03 +00:00
Eelco Dolstra
2750bec889 * Latest version.
svn path=/nixpkgs/trunk/; revision=13643
2008-12-16 00:18:20 +00:00
Eelco Dolstra
d25aa3c8a5 * checkinstall: build properly on x86_64.
* checkinstall: get rid of the RUNPATH in the LD_PRELOAD library so
  that it works with native Glibc (e.g. in VM builds).
* debBuild: use our own checkinstall.  In particular this allows us to
  build Debs on x86_64.

svn path=/nixpkgs/trunk/; revision=13608
2008-12-10 17:12:19 +00:00
Eelco Dolstra
016e2d912e * Name attribute did not match the actual version.
svn path=/nixpkgs/trunk/; revision=13600
2008-12-09 13:52:37 +00:00
Eelco Dolstra
9f206fb8f9 * Use the latest unstable Nix.
svn path=/nixpkgs/trunk/; revision=13503
2008-11-28 18:43:19 +00:00
Eelco Dolstra
c90bd0756c * Automatically build Debian packages using checkinstall, as suggested
by Pjotr Prins a while back.  This could also be used to generate
  RPMs for packages that don't have a spec-file.

* Added checkinstall to Nixpkgs.  However we don't use our own build
  yet because with it "make install" segfaults in a Debian VM, while
  the pre-built binary does work.

svn path=/nixpkgs/trunk/; revision=13400
2008-11-25 02:20:41 +00:00
Eelco Dolstra
a4a95f2962 * Latest stable, unstable releases.
svn path=/nixpkgs/trunk/; revision=13365
2008-11-21 17:06:49 +00:00
Eelco Dolstra
6a05e154a8 * Get rid of nix-static, it's no longer needed and horribly
out-dated.

svn path=/nixpkgs/trunk/; revision=13300
2008-11-14 16:59:02 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Eelco Dolstra
a644a08a25 * Latest version.
svn path=/nixpkgs/trunk/; revision=13021
2008-10-09 12:55:55 +00:00
Eelco Dolstra
a5231ec30e * Latest dpkg (the old one has disappeared).
svn path=/nixpkgs/trunk/; revision=12848
2008-09-12 13:14:06 +00:00
Michael Raskin
731cf5fff0 Updating nixUnstable.
svn path=/nixpkgs/trunk/; revision=12827
2008-09-08 21:06:41 +00:00
Eelco Dolstra
37b7f0ffeb * The latest and greatest.
svn path=/nixpkgs/trunk/; revision=12733
2008-08-27 09:48:41 +00:00
Marc Weber
9075ea2218 moved nix-repository-manager to add additional feature automatically updating given bleeding-edge-fetch-infos.nix
svn path=/nixpkgs/trunk/; revision=12658
2008-08-19 12:36:00 +00:00
Sander van der Burg
b5b68ce414 Upgrade to newer version
svn path=/nixpkgs/trunk/; revision=12654
2008-08-18 21:05:32 +00:00
Sander van der Burg
21cc160792 Another update to a new revision
svn path=/nixpkgs/trunk/; revision=12602
2008-08-12 15:56:49 +00:00
Sander van der Burg
7bb4aae65f Updated to later revision
svn path=/nixpkgs/trunk/; revision=12595
2008-08-12 13:09:14 +00:00
Sander van der Burg
66b7b8c6d8 Small disnix bugfix
svn path=/nixpkgs/trunk/; revision=12592
2008-08-12 12:03:35 +00:00
Sander van der Burg
92c6c54cdc Updated to newer version of disnix
svn path=/nixpkgs/trunk/; revision=12591
2008-08-12 11:25:46 +00:00
Sander van der Burg
a65819332f Also install the Nix expressions
svn path=/nixpkgs/trunk/; revision=12587
2008-08-11 21:09:43 +00:00
Sander van der Burg
ac3582350e Updated DisnixService to new revision
svn path=/nixpkgs/trunk/; revision=12577
2008-08-10 20:07:53 +00:00
Marc Weber
ec717200c8 ghc68extralibraries: tidied up, no longer many small files, nicer indentation (at least same level now)
svn path=/nixpkgs/trunk/; revision=12517
2008-08-06 16:56:05 +00:00
Sander van der Burg
3bd550f170 Some fixes
svn path=/nixpkgs/trunk/; revision=12450
2008-07-30 13:37:44 +00:00
Eelco Dolstra
0d7a514a68 * Use the latest unstable version.
svn path=/nixpkgs/trunk/; revision=12414
2008-07-24 13:02:10 +00:00
Sander van der Burg
f579e01606 Updated to new version
svn path=/nixpkgs/trunk/; revision=12355
2008-07-14 14:41:36 +00:00
Sander van der Burg
cbc9ca34b5 Upgraded disnix
svn path=/nixpkgs/trunk/; revision=12333
2008-07-10 14:09:19 +00:00
Sander van der Burg
4987da9c2b Added Disnix SOAP service
svn path=/nixpkgs/trunk/; revision=12291
2008-07-06 21:38:34 +00:00
Sander van der Burg
27b7b3af8e Added disnix
svn path=/nixpkgs/trunk/; revision=12277
2008-07-06 15:45:26 +00:00
Eelco Dolstra
b81415699f * Updated nixUnstable to the latest version. This is the first no-bdb
version, so if you use it, it will convert /nix/var/nix/db to the
  new schema.

svn path=/nixpkgs/trunk/; revision=12181
2008-06-24 09:39:19 +00:00
Eelco Dolstra
18ddaba5a9 * Latest dpkg. The previous version has disappeared.
svn path=/nixpkgs/trunk/; revision=11910
2008-05-27 16:46:40 +00:00
Michael Raskin
2d15d345ec Relaxed nixCustomFun parameter constraints a bit (string -> string or list of strings)
svn path=/nixpkgs/trunk/; revision=11901
2008-05-26 19:04:19 +00:00
Eelco Dolstra
94672236c6 svn path=/nixpkgs/trunk/; revision=11899 2008-05-26 14:01:11 +00:00
Michael Raskin
9b2cc890eb Updated customisable Nix expression
svn path=/nixpkgs/trunk/; revision=11757
2008-05-06 07:03:09 +00:00
Eelco Dolstra
aa2a573225 * Latest unstable version.
svn path=/nixpkgs/trunk/; revision=11310
2008-03-27 17:54:17 +00:00
Eelco Dolstra
5f683794c2 * Set admindir to /var/lib/dpkg.
svn path=/nixpkgs/trunk/; revision=11124
2008-03-14 13:44:58 +00:00
Eelco Dolstra
842eda63f8 * Nasty hacks to get dpkg to set the architecture correctly.
svn path=/nixpkgs/trunk/; revision=11100
2008-03-13 14:58:17 +00:00
Eelco Dolstra
6ea7522ba2 * Added dpkg.
svn path=/nixpkgs/trunk/; revision=11088
2008-03-12 20:46:47 +00:00
Marc Weber
bad0d45562 jdk updated to 1.5.0.15
updated bleeding edge stuff (should now work for the bulidfarm as well because
  dist files are stored on my server)
moved experimental my_env into its own file

svn path=/nixpkgs/trunk/; revision=11026
2008-03-09 00:08:45 +00:00
Marc Weber
1b51b70317 - fetchdarcs supports now partial
- fetchdarcs_2pre added
- flapjax added
- no longer used : annotatedDerivations
- added bleeding edge repos with a tiny nix repository manager which dowloads and
  updates repostiries, then creates tar.gz dist files which are used by bleeding_edge_source
  (darcs tested only by now)
- added experimental my_environment with example

svn path=/nixpkgs/trunk/; revision=10974
2008-03-06 02:46:29 +00:00
Wouter den Breejen
7dcca76e91 SNix update
svn path=/nixpkgs/trunk/; revision=10949
2008-03-04 14:23:29 +00:00
Eelco Dolstra
051cd950fe * Use the latest Nix. What a relief. :-)
svn path=/nixpkgs/trunk/; revision=10801
2008-02-21 13:44:06 +00:00
Wouter den Breejen
03473a3fc3 Added SNIX which is Nix extended with options to handle state (not stable yet and needs ext3cow so i do not recommend updating unless you are interested)
svn path=/nixpkgs/trunk/; revision=10771
2008-02-20 12:29:41 +00:00
Eelco Dolstra
7842f1cbf2 * Latest unstable version.
svn path=/nixpkgs/trunk/; revision=10536
2008-02-07 10:21:52 +00:00
Eelco Dolstra
5e629257d8 * Latest unstable Nix.
svn path=/nixpkgs/trunk/; revision=10397
2008-01-30 00:56:10 +00:00
Michael Raskin
a5e3c976f4 Updated nixUnstable
svn path=/nixpkgs/trunk/; revision=10230
2008-01-20 11:19:20 +00:00
Eelco Dolstra
43bb722ed9 * Reviving the bleeding edge.
svn path=/nixpkgs/trunk/; revision=10079
2008-01-05 23:23:36 +00:00
Eelco Dolstra
5a870b6ea9 * Nix 0.11.
svn path=/nixpkgs/trunk/; revision=10036
2008-01-01 11:30:41 +00:00
Eelco Dolstra
b98c67b1c3 * Use the latest Nix.
svn path=/nixpkgs/trunk/; revision=9751
2007-11-19 11:07:51 +00:00
Eelco Dolstra
15d26bb5c9 * Use latest Nix.
svn path=/nixpkgs/trunk/; revision=9695
2007-11-15 17:05:45 +00:00
Michael Raskin
076cc3a7d8 Now SVN Nix builds as a purely alternative Nix choice
svn path=/nixpkgs/trunk/; revision=9666
2007-11-14 01:20:17 +00:00
Michael Raskin
29e0bc3103 Added possibility to use non-default Nix.
svn path=/nixpkgs/trunk/; revision=9663
2007-11-13 15:52:16 +00:00
Eelco Dolstra
623437eaa2 * Latest version.
svn path=/nixpkgs/trunk/; revision=9584
2007-11-05 11:22:37 +00:00
Eelco Dolstra
dc49f13eef * Latest version.
svn path=/nixpkgs/trunk/; revision=9479
2007-10-19 11:38:58 +00:00
Eelco Dolstra
639faa0233 * Use latest Nix-unstable.
svn path=/nixpkgs/trunk/; revision=9333
2007-09-18 14:57:47 +00:00
Eelco Dolstra
a1022416c5 * Latest unstable Nix.
svn path=/nixpkgs/trunk/; revision=9274
2007-09-06 20:45:36 +00:00
Marc Weber
606dba5d0a update nix version to latest nix-0.11pre9217
svn path=/nixpkgs/trunk/; revision=9218
2007-08-30 14:44:02 +00:00
Eelco Dolstra
6f1ad6fd79 * Function `writeScript' which is like writeText but makes its output executable.
* Latest unstable Nix.

svn path=/nixpkgs/trunk/; revision=9123
2007-08-14 16:41:41 +00:00
Michael Raskin
efbabdb598 Converted Vim package to a template-based form with only lists filled in manually. Added library functions to support it. Added two proposed package templates to top-level, so that every discussion about package format can result in just editing templates or adding new ones.
svn path=/nixpkgs/trunk/; revision=9100
2007-08-11 10:34:07 +00:00
Eelco Dolstra
97b9846c06 * Latest unstable Nix.
svn path=/nixpkgs/trunk/; revision=8823
2007-06-04 10:22:26 +00:00
Eelco Dolstra
74ac11507f * Latest unstable Nix.
svn path=/nixpkgs/trunk/; revision=8649
2007-05-02 21:35:49 +00:00
Eelco Dolstra
a7d27b2201 * Move nix to tools/package-management, and use the latest unstable
release.

svn path=/nixpkgs/trunk/; revision=8477
2007-03-29 09:24:14 +00:00
Eelco Dolstra
505c169238 * Revived RPM. Damn, RPM is nasty to build.
svn path=/nixpkgs/trunk/; revision=8407
2007-03-21 19:25:58 +00:00