philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

4256 commits

Author SHA1 Message Date
Eelco Dolstra 19158d7dec * CURL: build without scp support on Cygwin because libssh2 doesn't 
build.

svn path=/nixpkgs/trunk/; revision=23142
 2010-08-12 11:54:55 +00:00
Peter Simons ff1c057f7a pkgs/top-level/all-packages.nix: removed lowPri modifier from python27Full 
The "full" version is preferrable over the "base" version in user
profiles.

svn path=/nixpkgs/trunk/; revision=23141
 2010-08-12 11:23:54 +00:00
Peter Simons a1039a2744 pkgs/top-level/all-packages.nix: stripped trailing whitespace 
svn path=/nixpkgs/trunk/; revision=23140
 2010-08-12 11:22:06 +00:00
Lluís Batlle i Rossell 3a3867869a Adding tetgen 
svn path=/nixpkgs/trunk/; revision=23138
 2010-08-12 10:59:05 +00:00
Eelco Dolstra e897a308a6 * Added MESS, the Multi Emulator Super System. 
svn path=/nixpkgs/trunk/; revision=23126
 2010-08-11 19:47:05 +00:00
Michael Raskin 670135ecb6 flup and ViewMTN seem to work just as well with default Python 
svn path=/nixpkgs/trunk/; revision=23119
 2010-08-11 16:28:53 +00:00
Peter Simons ee70d8481d pkgs/top-level/all-packages.nix: strip trailing whitenspace 
svn path=/nixpkgs/trunk/; revision=23118
 2010-08-11 15:49:42 +00:00
Peter Simons 2b37d181a5 Added Python version 2.7. 
svn path=/nixpkgs/trunk/; revision=23117
 2010-08-11 15:49:03 +00:00
Eelco Dolstra 21587bf10b * Use callPackage_i686 for i686-only packages. 
svn path=/nixpkgs/trunk/; revision=23113
 2010-08-11 13:25:30 +00:00
Rob Vermaas a60809353a updated nss and nspr, added variant of nss including tools 
svn path=/nixpkgs/trunk/; revision=23105
 2010-08-11 09:38:09 +00:00
Eelco Dolstra f6baaeace8 * Add Xfce to the channel. 
svn path=/nixpkgs/trunk/; revision=23081
 2010-08-10 00:09:29 +00:00
Lluís Batlle i Rossell a6aae3bc6d Adding the matchbox window manager 
svn path=/nixpkgs/trunk/; revision=23076
 2010-08-09 22:40:51 +00:00
Lluís Batlle i Rossell 9cba74c95a Adding 'yacas', a CAS implemented in C++. 
svn path=/nixpkgs/trunk/; revision=23074
 2010-08-09 21:58:21 +00:00
Lluís Batlle i Rossell ac387916b8 Adding the calendar program 'pal' 
svn path=/nixpkgs/trunk/; revision=23070
 2010-08-09 21:13:36 +00:00
Lluís Batlle i Rossell 1b59ae0b83 Adding 'mupdf', a lightweight PDF 1.7 viewer 
As a side effect, I add openjpeg and jbig2dec.

svn path=/nixpkgs/trunk/; revision=23069
 2010-08-09 20:59:38 +00:00
Rob Vermaas 2670c1c67b update some perl packages 
svn path=/nixpkgs/trunk/; revision=23066
 2010-08-09 19:29:06 +00:00
Rob Vermaas 79fcd0a04c updated net::twitter, scope::upper, added uri::googlechart 
svn path=/nixpkgs/trunk/; revision=23065
 2010-08-09 18:45:44 +00:00
Eelco Dolstra 4ae72f5ab2 * Added pkgs/data/misc/hicolor-icon-theme, required by Xfce. 
svn path=/nixpkgs/trunk/; revision=23060
 2010-08-09 18:00:08 +00:00
David Guibert 3b6101cd7f msn-pecan: an alternative MSN plugin for pidgin 
svn path=/nixpkgs/trunk/; revision=23050
 2010-08-09 06:51:34 +00:00
Eelco Dolstra 1089153c7f * Add some more Xfce packages. 
svn path=/nixpkgs/trunk/; revision=23047
 2010-08-08 22:43:00 +00:00
Lluís Batlle i Rossell 089ee5da11 Fix the cross-building of packages mentioned in stdenvLinux.overrides. 
svn path=/nixpkgs/trunk/; revision=23038
 2010-08-08 17:26:30 +00:00
Michael Raskin 87cbef96ca Add Veracity distributed VCS (+ issue tracker) 
svn path=/nixpkgs/trunk/; revision=23031
 2010-08-07 22:44:25 +00:00
Michael Raskin 5792074ddc Add an RC (1.8.0-rc1) of SpiderMonkey by cloning the release expression 
svn path=/nixpkgs/trunk/; revision=23030
 2010-08-07 21:44:13 +00:00
Eelco Dolstra 49dd595e2d * Add some missing X.org packages to the channel. 
svn path=/nixpkgs/trunk/; revision=23025
 2010-08-07 18:21:16 +00:00
Eelco Dolstra d7842faf49 * Added UNetbootin, a program for creating bootable USB sticks from 
ISO images.

svn path=/nixpkgs/trunk/; revision=23018
 2010-08-06 22:33:14 +00:00
Eelco Dolstra 2148d43a6d * Added mtools. 
svn path=/nixpkgs/trunk/; revision=23014
 2010-08-06 21:36:54 +00:00
Yury G. Kudryashov 2d9d69cb63 Add lcms2 
svn path=/nixpkgs/trunk/; revision=23012
 2010-08-06 20:23:56 +00:00
Yury G. Kudryashov c766124771 Add kdePackage function 
svn path=/nixpkgs/trunk/; revision=23008
 2010-08-06 20:20:19 +00:00
Peter Simons 6dad13cb74 pkgs/top-level/all-packages.nix: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=23000
 2010-08-06 12:47:20 +00:00
Peter Simons 3e095243bd pkgs/top-level/all-packages.nix: don't enable ACL support in rsync when building on Solaris 
svn path=/nixpkgs/trunk/; revision=22999
 2010-08-06 12:46:18 +00:00
Peter Simons f4f3078309 pkgs/top-level/all-packages.nix: curl cannot support scp on Solaris because libssh2 doesn't compile 
svn path=/nixpkgs/trunk/; revision=22998
 2010-08-06 12:45:58 +00:00
Eelco Dolstra a1e834e85a * Get rid of the ugly `useFromStdenv' hack in all-packages.nix. 
Instead, use the generic package override mechanism to use packages
  from earlier bootstrap phases.
* Don't rely on the existence of attributes such as
  `stdenv.coreutils'.

svn path=/nixpkgs/trunk/; revision=22991
 2010-08-06 10:34:34 +00:00
Rob Vermaas d8ba69a16e added older version of sqlite for use in DBD-SQLite perl package, which fails with newest one 
svn path=/nixpkgs/trunk/; revision=22989
 2010-08-06 08:54:27 +00:00
David Guibert f3403647d4 pam_ccreds: to locally authenticate using an enterprise identity when the network is unavailable. 
svn path=/nixpkgs/trunk/; revision=22987
 2010-08-06 08:50:58 +00:00
David Guibert 663cff60a4 pam_krb5: added version 2.3.11-1. 
svn path=/nixpkgs/trunk/; revision=22984
 2010-08-06 08:49:05 +00:00
Yury G. Kudryashov 80108f291b Add optional scp support to curl 
svn path=/nixpkgs/trunk/; revision=22976
 2010-08-05 21:06:45 +00:00
Yury G. Kudryashov 217209747b Add libssh2 
svn path=/nixpkgs/trunk/; revision=22975
 2010-08-05 20:24:32 +00:00
Eelco Dolstra 5f8b8ae1d1 * Added weechat and updated xfce-terminal and vte. (From Graeme 
Caldwell <graemercaldwell@gmail.com>.)

svn path=/nixpkgs/trunk/; revision=22965
 2010-08-05 15:47:15 +00:00
Eelco Dolstra 32b5de83c4 svn path=/nixpkgs/trunk/; revision=22959 2010-08-05 10:42:05 +00:00
Eelco Dolstra b29496c4be * Adobe Reader: updated to 9.3.3. Make it installable on 
x86_64-linux.

svn path=/nixpkgs/trunk/; revision=22956
 2010-08-05 08:54:58 +00:00
Peter Simons ae68ed0907 pkgs/top-level/all-packages.nix: prefer sqliteInteractive in user environments, i.e. when running "nix-env -i sqlite" 
svn path=/nixpkgs/trunk/; revision=22944
 2010-08-04 11:42:10 +00:00
Yury G. Kudryashov ce3aef6d7b Add phonon-backend-vlc 
svn path=/nixpkgs/trunk/; revision=22939
 2010-08-04 10:04:40 +00:00
Marco Maggesi 8dca34b5ed Upgrade dmtcp to version 1.1.8 
svn path=/nixpkgs/trunk/; revision=22933
 2010-08-03 17:39:12 +00:00
Yury G. Kudryashov 3c4d5457a8 Add recurseForRelease flag 
I don't want kde-4.5 to be visible for nix-env, but I want hydra to build it

svn path=/nixpkgs/trunk/; revision=22930
 2010-08-03 14:02:42 +00:00
Yury G. Kudryashov 75bc6a2f78 Inherit some metadata from kdelibs 
svn path=/nixpkgs/trunk/; revision=22927
 2010-08-03 13:11:58 +00:00
Michael Raskin e8a33e0c82 Make configurable Vim build with most options 
svn path=/nixpkgs/trunk/; revision=22924
 2010-08-03 10:59:57 +00:00
Yury G. Kudryashov e24d7319d4 Use callPackage in kde45 
svn path=/nixpkgs/trunk/; revision=22921
 2010-08-03 10:38:02 +00:00
Michael Raskin 6cd4db5496 Use the same qt4 for psi as for the used qca2 
svn path=/nixpkgs/trunk/; revision=22918
 2010-08-03 08:42:28 +00:00
Michael Raskin 50f2d32ce9 Use updated QCA2 for psi 
svn path=/nixpkgs/trunk/; revision=22914
 2010-08-03 07:39:56 +00:00
Yury G. Kudryashov 858ce6dfd9 Remove smbfsFuse from release.nix, use meta.platforms instead 
svn path=/nixpkgs/trunk/; revision=22908
 2010-08-02 21:43:53 +00:00
Yury G. Kudryashov fd7bcca52e all-packages: remove trailing spaces 
svn path=/nixpkgs/trunk/; revision=22907
 2010-08-02 21:40:34 +00:00
Eelco Dolstra 7e453a7491 * Fix breakage in r22897. 
svn path=/nixpkgs/trunk/; revision=22901
 2010-08-02 17:59:19 +00:00
Yury G. Kudryashov dea41a12ea Add rsibreak 
svn path=/nixpkgs/trunk/; revision=22897
 2010-08-02 17:19:44 +00:00
Yury G. Kudryashov 695b150844 Add polkit-qt-1, strigi, kdelibs-4.4.92 
svn path=/nixpkgs/trunk/; revision=22890
 2010-08-02 17:12:39 +00:00
Yury G. Kudryashov 915edddc5b Add parts of kdesupport for kde-4.5 
svn path=/nixpkgs/trunk/; revision=22889
 2010-08-02 17:11:19 +00:00
Eelco Dolstra d17f0f9cbc * Use callPackage for most packages in all-packages.nix. 
`callPackage' was described here:

    http://www.mail-archive.com/nix-dev@cs.uu.nl/msg02624.html

  It allows all-packages.nix to be shortened significantly (from 10152
  to 6980 lines) by automatically filling in package functions'
  required arguments from `pkgs'.  That is, a function

    { stdenv, fetchurl, libfoo, libbar }: ...

  can now be called as

    callPackage ./<bla>.nix { };

  rather than

    import ./<bla>.nix {
      inherit stdenv fetchurl libfoo libbar;
    };

  This reduces boring typing work when adding a dependency and reduces
  the number of trivial commits to all-packages.nix.

  Overrides or arguments that don't exist in `pkgs' can be passed
  explicitly, e.g.,

    callPackage ./<bla>.nix {
      libfoo = libfoo_1_2_3;
    };

  The conversion was done automatically with a magic Perl regexp.  I
  checked that `nix-env' produces the same results before and after
  (except for three packages that depend on webkit, which uses
  deepOverride).

  `callPackage' applies `makeOverridable' automatically, so almost
  every package now exports an `override' function.

  There are two downsides to using callPackage:

  - Evaluation is a bit slower (about 15% on `nix-env -qa --drv-path
    \*').

  - There can be unexpected results for functions that have default
    argument values.  For instance, a function

      { libfoo ? null }: ...

    called using `callPackage' will be passed a `libfoo' argument
    provided that `pkgs.libfoo' exists.  If this is used to control
    whether a package has to have a certain dependency, you need to
    explicitly write:

    callPackage ./<bla>.nix {
      libfoo = null;
    };

svn path=/nixpkgs/trunk/; revision=22885
 2010-08-02 16:26:58 +00:00
Eelco Dolstra cc84ac9e84 svn path=/nixpkgs/trunk/; revision=22880 2010-08-02 16:01:55 +00:00
Eelco Dolstra fd268b4852 * Add callPackage etc. 
svn path=/nixpkgs/trunk/; revision=22876
 2010-08-02 13:57:57 +00:00
Rob Vermaas 70c6ab18a3 added qrupdate, suitesparse needed to build octave from source 
svn path=/nixpkgs/trunk/; revision=22867
 2010-08-02 11:20:39 +00:00
Rob Vermaas fb6ca79d35 HDF5 1.8.5 
svn path=/nixpkgs/trunk/; revision=22861
 2010-08-02 08:58:53 +00:00
Eelco Dolstra 283005d568 * GemRB updated to 0.6.1. 
svn path=/nixpkgs/trunk/; revision=22837
 2010-08-01 14:24:46 +00:00
Yury G. Kudryashov 3cae107cca Fix nixpkgs evaluation 
I've removed rekonqScm but forgotten to remove it from all-packages

svn path=/nixpkgs/trunk/; revision=22836
 2010-07-31 18:47:15 +00:00
Yury G. Kudryashov 45fd5a9836 Upgrade rekonq 
svn path=/nixpkgs/trunk/; revision=22835
 2010-07-31 13:06:10 +00:00
Yury G. Kudryashov 288c414bb4 pulseaudio: udev and bluez support 
svn path=/nixpkgs/trunk/; revision=22834
 2010-07-31 13:05:58 +00:00
Yury G. Kudryashov 65f0b956a2 Add libsndfile and fftw support to libsamplerate 
svn path=/nixpkgs/trunk/; revision=22831
 2010-07-30 20:17:37 +00:00
Yury G. Kudryashov 2835a98378 Add qt-4.7.0-beta2 
svn path=/nixpkgs/trunk/; revision=22830
 2010-07-30 19:45:07 +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 ef0ff49ad4 svn path=/nixpkgs/trunk/; revision=22826 2010-07-30 13:05:52 +00:00
Eelco Dolstra 9375dad95a * Remove findutils-wrapper (obsolete). 
* Remove some unnecessary / inappropriate lowPrios.

svn path=/nixpkgs/trunk/; revision=22825
 2010-07-30 12:31:10 +00:00
Eelco Dolstra 35b4ccadba svn path=/nixpkgs/trunk/; revision=22824 2010-07-30 12:24:19 +00:00
Eelco Dolstra ee4fe6ea84 * Drop pkgsOverriden. 
svn path=/nixpkgs/trunk/; revision=22823
 2010-07-30 12:10:24 +00:00
Eelco Dolstra 3386a0e63d svn path=/nixpkgs/trunk/; revision=22822 2010-07-30 10:48:13 +00:00
Eelco Dolstra acd34843f0 * Move "checker" to lib. It seems to be unused though. 
svn path=/nixpkgs/trunk/; revision=22819
 2010-07-30 09:24:55 +00:00
Lluís Batlle i Rossell b044e64989 Making the xburst-tools for the Ben Nanonote build the firmware they need to 
communicate with it. This involves making a cross-compiler for mipsel.

svn path=/nixpkgs/trunk/; revision=22818
 2010-07-29 23:26:07 +00:00
Lluís Batlle i Rossell 537ad15e86 Adding xburst-tools to manage the USB_BOOT mode of the Ben Nanonote (reflashing, ...) 
I add the 'confuse' library as a side effect.

svn path=/nixpkgs/trunk/; revision=22817
 2010-07-29 23:25:42 +00:00
Lluís Batlle i Rossell 2423a7c821 Enabling the build of uclibc (I don't know why it was commented) 
svn path=/nixpkgs/trunk/; revision=22816
 2010-07-29 23:18:49 +00:00
Eelco Dolstra 20db67154c * bclr: shrink fixes.patch from 3.6 MB (!) to 11 KB by not 
including Autoconf/Automake generated code.

svn path=/nixpkgs/trunk/; revision=22815
 2010-07-29 19:56:16 +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
Lluís Batlle i Rossell 79dec6e9a7 Adding Vigra 
svn path=/nixpkgs/trunk/; revision=22809
 2010-07-29 14:38:39 +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
Lluís Batlle i Rossell 41b7a3cda6 Making tigervnc build with the xserver 1.8 
svn path=/nixpkgs/trunk/; revision=22802
 2010-07-29 07:59:06 +00:00
Eelco Dolstra b1afe4e7ac * Finish renaming. 
svn path=/nixpkgs/trunk/; revision=22801
 2010-07-29 07:02:26 +00:00
Eelco Dolstra 5b2dcdd24d * Remove the old PHP. 
svn path=/nixpkgs/trunk/; revision=22800
 2010-07-29 07:00:00 +00:00
Eelco Dolstra f1598a8941 * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22798
 2010-07-28 18:01:17 +00:00
Eelco Dolstra d67aefc19d * Remove `customKernel' which is obsolete as far as I can tell. 
* Remove `sumTwoArgs' since it has no remaining callers.

svn path=/nixpkgs/trunk/; revision=22797
 2010-07-28 16:09:13 +00:00
Eelco Dolstra fa314f0724 * Remove KVM (obsolete -> qemu-kvm). 
svn path=/nixpkgs/trunk/; revision=22796
 2010-07-28 15:39:39 +00:00
Eelco Dolstra 749b8607ca * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22795
 2010-07-28 15:35:01 +00:00
Peter Simons 93ff8697d1 pkgs/tools/networking/p2p/tahoe-lafs: add mock060 to propagatedBuildInputs 
The package is required for the regression test suite. Adding it to
buildInputs would probably work, too, but I haven't tried it.

svn path=/nixpkgs/trunk/; revision=22792
 2010-07-28 13:09:20 +00:00
Peter Simons 38bda8a8bf pkgs/top-level/python-packages.nix: added python-mock-0.6.0 
This version seems to be an unofficial release from tahoe-lafs.org based
on the mock-0.1.0 release from python-mock.sourceforge.net. It should
probably replace the old version we have in here.

svn path=/nixpkgs/trunk/; revision=22791
 2010-07-28 13:09:04 +00:00
Peter Simons 4630c1854d pycryptopp: base python wrapper on the Nix store version of libcrypto++ 
rather than the version that's included in the distribution archive

svn path=/nixpkgs/trunk/; revision=22788
 2010-07-28 13:07:05 +00:00
Peter Simons df013849e4 python-numpy: improved support for BLAS and LAPACK via gfortran 
svn path=/nixpkgs/trunk/; revision=22787
 2010-07-28 13:05:35 +00:00
Peter Simons b89f310c7a pkgs/development/libraries/crypto++: fixed build impurity 
* Don't build with "-march=native", because the generated binaries
   won't work reliably on systems with a different CPU. Instead,
   "--march=i686" is used on x86, and "--march=nocona" an x86_64.
   Otherwise, "--march" remains unset.

 * Compile with -O3 instead of -O2. This code is performance-critical.

 * Don't build with '-g'.

svn path=/nixpkgs/trunk/; revision=22785
 2010-07-28 13:03:11 +00:00
Eelco Dolstra d81ed8201f * Turn vim/default.nix into a regular package. We don't need two 
configurable VIMs.

svn path=/nixpkgs/trunk/; revision=22784
 2010-07-28 12:52:54 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
 2010-07-28 11:55:54 +00:00
Peter Simons ea3ce74312 python-setuptools-darcs: the build process seems to depend on 'darcsver' 
| source root is setuptools_darcs-1.2.9
 | patching sources
 | configuring
 | no configure script, doing nothing
 | building
 | running tests
 | Download error: [Errno -3] Temporary failure in name resolution -- Some packages may not be found!
 | Couldn't find index page for 'darcsver' (maybe misspelled?)
 | Download error: [Errno -3] Temporary failure in name resolution -- Some packages may not be found!
 | No local packages or download links found for darcsver>=1.2.0
 | Traceback (most recent call last):
 |   File "setup.py", line 79, in <module>
 |     zip_safe=False, # I prefer unzipped for easier access.
 |   File "/nix/store/r6xlmlf0amzwhkvkv0v656jgx7r299g7-python-2.6.5/lib/python2.6/distutils/core.py", line 113, in setup
 |     _setup_distribution = dist = klass(attrs)
 |   File "build/bdist.linux-x86_64/egg/setuptools/dist.py", line 260, in __init__
 |   File "build/bdist.linux-x86_64/egg/setuptools/dist.py", line 284, in fetch_build_eggs
 |   File "build/bdist.linux-x86_64/egg/pkg_resources.py", line 563, in resolve
 |   File "build/bdist.linux-x86_64/egg/pkg_resources.py", line 799, in best_match
 |   File "build/bdist.linux-x86_64/egg/pkg_resources.py", line 811, in obtain
 |   File "build/bdist.linux-x86_64/egg/setuptools/dist.py", line 327, in fetch_build_egg
 |   File "build/bdist.linux-x86_64/egg/setuptools/command/easy_install.py", line 434, in easy_install
 |   File "build/bdist.linux-x86_64/egg/setuptools/package_index.py", line 475, in fetch_distribution
 | AttributeError: 'NoneType' object has no attribute 'clone'
 | builder for `/nix/store/rkm5fzs0p6hh45mvpzv0qqphmsjnyag8-python-setuptools-darcs-1.2.9.drv' failed with exit code 1
 | error: build of `/nix/store/rkm5fzs0p6hh45mvpzv0qqphmsjnyag8-python-setuptools-darcs-1.2.9.drv' failed

svn path=/nixpkgs/trunk/; revision=22780
 2010-07-28 09:33:35 +00:00
Peter Simons 1bb86133c7 pkgs/tools/networking/p2p/tahoe-lafs: updated to version 1.7.1 
svn path=/nixpkgs/trunk/; revision=22774
 2010-07-27 23:52:22 +00:00
Peter Simons 3819998730 pycryptopp: updated to version 0.5.19 
svn path=/nixpkgs/trunk/; revision=22772
 2010-07-27 23:52:08 +00:00
Peter Simons ceb01a86ea python-nevow: updated to version 0.10.0 
svn path=/nixpkgs/trunk/; revision=22771
 2010-07-27 23:52:02 +00:00
Peter Simons d1b181e8bb python-foolscap: updated to version 0.5.1 
svn path=/nixpkgs/trunk/; revision=22770
 2010-07-27 23:51:56 +00:00
Peter Simons 07a0bf9be0 python-darcsver: updated to version 1.5.1 
svn path=/nixpkgs/trunk/; revision=22769
 2010-07-27 23:51:48 +00:00