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

3642 commits

Author SHA1 Message Date
Eelco Dolstra 1ac9dcd24d * Fix eval-release.nix by testing whether all attributes of a 
derivation evaluate inside the tryEval.  This catches cases such as
  aufs2-util, which fails due to an assertion in its dependency aufs2.
* Explicitly blacklist "xbursttools" because it gives some
  evaluation error in cross-OpenSSL.  No idea why, probably due to
  some pass-through attribute.

svn path=/nixpkgs/trunk/; revision=23247
 2010-08-19 12:37:10 +00:00
Eelco Dolstra 435ba71ac0 * Fix a "undefined variable `pyrex'" error that only happens on Nix 
0.15, not 0.16.

svn path=/nixpkgs/trunk/; revision=23244
 2010-08-19 09:55:50 +00:00
Yury G. Kudryashov 2957f9cc11 Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work 
svn path=/nixpkgs/trunk/; revision=23241
 2010-08-18 23:04:21 +00:00
Yury G. Kudryashov 9c1a9c2c4b Make qt47 more override-friendly 
svn path=/nixpkgs/trunk/; revision=23240
 2010-08-18 22:53:42 +00:00
Ludovic Courtès 4a909f0838 libcanberra: Remove useless ‘gthread’ argument. 
svn path=/nixpkgs/trunk/; revision=23226
 2010-08-18 14:27:04 +00:00
Ludovic Courtès 904c8cfa0a Castle-Combat: Start fixing; rewrite using `buildPythonPackage'. 
svn path=/nixpkgs/trunk/; revision=23225
 2010-08-18 14:25:07 +00:00
Marco Maggesi 4b4ab6551c Improve os-specific/linux/blcr. Fix a problem with shared objects 
svn path=/nixpkgs/trunk/; revision=23213
 2010-08-17 16:53:34 +00:00
Eelco Dolstra f5f32a5b4b * Nix 0.16. 
svn path=/nixpkgs/trunk/; revision=23208
 2010-08-17 15:21:42 +00:00
Eelco Dolstra ed5011cc02 * Make sure that in an override like: 
python = pkgs.python27Full;
    pythonBase = pkgs.python27Base;

  a build of (say) Firefox doesn't depend on python26 as well as
  python27.  This happens because python27Full has this line:

    inherit (xlibs) libX11 xproto;

  which causes python27Full to use libX11 from pkgsOrig, where the
  override hasn't been applied.  The solution is to change it to
  
    inherit (pkgs.xlibs) libX11 xproto;

  In the future, to prevent this, we should make all-packages.nix a
  non-rec set and require all package references to explicitly go
  through pkgs.<attr>.  (Then we can also drop the ugly __overrides
  language "feature".)

svn path=/nixpkgs/trunk/; revision=23203
 2010-08-17 11:35:49 +00:00
Peter Simons f99f1bc055 pkgs/top-level/all-packages.nix: lower priority of the various python versions to give preference to pythonWrapper 
svn path=/nixpkgs/trunk/; revision=23202
 2010-08-17 10:19:48 +00:00
Peter Simons 9670fca780 Added "python-$version-wrapper" expression. 
The python wrapper expression expects a list of Python modules, $extraLibs,
which are added to $PYTHONPATH before executing the actual Python interpreter.

svn path=/nixpkgs/trunk/; revision=23194
 2010-08-16 17:03:35 +00:00
Peter Simons 42b5198e5b pkgs/top-level/all-packages.nix: disable doCheck for setuptools when run with Python 2.7 
The regression test suite fails with the following error:

  ======================================================================
  FAIL: test_get_script_header_jython_workaround (setuptools.tests.test_resources.ScriptHeaderTests)
  ----------------------------------------------------------------------
  Traceback (most recent call last):
    File "/tmp/nix-build-0zz04maf217x7a6fq18ccmx5s1mrijlr-setuptools-0.6c11.drv-0/setuptools-0.6c11/setuptools/tests/test_resources.py", line 524, in test_get_script_header_jython_workaround
      self.assert_('Unable to adapt shebang line' in sys.stdout.getvalue())
  AssertionError: False is not True

I'm not sure yet what the problem is.

svn path=/nixpkgs/trunk/; revision=23193
 2010-08-16 17:03:19 +00:00
Yury G. Kudryashov f9a218b691 Add ebook-tools-0.1.1 
svn path=/nixpkgs/trunk/; revision=23189
 2010-08-16 12:40:03 +00:00
Yury G. Kudryashov 0ee0fb9387 Add libktorrent 
svn path=/nixpkgs/trunk/; revision=23186
 2010-08-16 08:34:26 +00:00
Yury G. Kudryashov 4db5058475 Add libqalculate 
svn path=/nixpkgs/trunk/; revision=23180
 2010-08-15 13:55:02 +00:00
Yury G. Kudryashov db36f89eca Add cln 
svn path=/nixpkgs/trunk/; revision=23179
 2010-08-15 13:54:27 +00:00
Michael Raskin 69a9e0a9fa Fix stupid typo in linux_2_6_35_oldI686 definition 
svn path=/nixpkgs/trunk/; revision=23174
 2010-08-14 17:13:42 +00:00
Michael Raskin 3a2f493750 Add latest Linux kernel for real i686 platform, not modern amd64-in-32bit-mode 
svn path=/nixpkgs/trunk/; revision=23173
 2010-08-14 16:04:02 +00:00
Andres Löh ced0d6de0d emacsPackages should inherit emacs to add the correct version 
to the inner scope

svn path=/nixpkgs/trunk/; revision=23159
 2010-08-13 07:55:57 +00:00
David Guibert 92d437c54f kernel updates and add kernel 2.6.35.1 
svn path=/nixpkgs/trunk/; revision=23155
 2010-08-12 16:33:19 +00:00
Peter Simons 04ee1d78ad pkgs/top-level/all-packages.nix: obsoleted setuptools_python26 and setuptools_python27 
Instead of having different setuptools expressions, buildPythonPackage
uses override to choose the desired python version. Now, technically,
buildPythonPackage shouldn't exist in multiple versions either. Maybe
the whole thing should be moved into python packages?

svn path=/nixpkgs/trunk/; revision=23151
 2010-08-12 14:01:51 +00:00
Peter Simons 63ce55d859 pkgs/top-level/all-packages.nix: lower priority of python27Base to ensure the full version is installed by default 
svn path=/nixpkgs/trunk/; revision=23146
 2010-08-12 12:53:51 +00:00
Peter Simons 8c1717677e pkgs/top-level/all-packages.nix: dropped TODO note from Python 2.7 
The expression used to say "FIXME: We lack ncurses support", but it
looks to me like ncurses *is* supported.

svn path=/nixpkgs/trunk/; revision=23144
 2010-08-12 12:53:36 +00:00
Peter Simons 70a603c4bb pkgs/top-level/all-packages.nix: dropped getConfig support for Python 2.7 
Python 2.7 can no longer be configured using the obsolete "getConfig"
mechanism. Instead, use "override" to fine-tune the installation.

svn path=/nixpkgs/trunk/; revision=23143
 2010-08-12 12:53:26 +00:00
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
Lluís Batlle i Rossell b368b4b199 Making more packages build on the Fuloong2f. 
I still can't build the kernel because it requires binutils yet to be released.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23132
 2010-08-11 20:16:09 +00:00
Lluís Batlle i Rossell 51f6aec764 Fixing the gcc-cross-wrapper; it failed after some changes related to breaking 
dependencies with it. (I should never link ld.so with a NIX_LDFLAGS -rpath
forced)

I made vim, scummvm cross-build. I added prboom (that cross-builds).
Mplayer and elinks don't cross-build fine still, but are on the way.
The mplayer fails to build in a weird way; nix does not show either a gcc
error message or even the 'make' error message.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23131
 2010-08-11 20:14:25 +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
Lluís Batlle i Rossell f9692a7f40 Update from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23097
 2010-08-10 17:20:15 +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 ff5d0fa448 Merging from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23072
 2010-08-09 21:21:30 +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
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 d75e47a383 Fix the cross-building of packages mentioned in stdenvLinux.overrides. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23043
 2010-08-08 18:52:21 +00:00
Lluís Batlle i Rossell eddc9d6ab5 Fixing the nanonote kernel expressions so they work. 
In fact only 2.6.34 boots fine, while 2.6.35 needs a fetchsvn new revision,
waiting for an upstream patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23039
 2010-08-08 18:46:57 +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
Lluís Batlle i Rossell f2de89336b Removing the 'useFromStdenv' still left on the gcc45 attribute (not properly 
updated from trunk)


svn path=/nixpkgs/branches/stdenv-updates/; revision=23029
 2010-08-07 21:31:16 +00:00
Lluís Batlle i Rossell 46082f25f9 Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
 2010-08-07 20:14:04 +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
Lluís Batlle i Rossell c82f2f533d Avoiding to make a profiled bootstrap of gcc on armv5tel-linux, because it fails there. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22970
 2010-08-05 18:40:58 +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
Lluís Batlle i Rossell b17d1d7d07 Adding nanonote kernel and uboot 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22943
 2010-08-04 11:07:13 +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
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
Lluís Batlle i Rossell 6d15eabdc1 Merging from trunk (the callPackage change) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22915
 2010-08-03 08:14:13 +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 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
Lluís Batlle i Rossell 905963782b Fixing some stdenv2 details coming from the trunk merge. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22881
 2010-08-02 16:09:20 +00:00
Eelco Dolstra cc84ac9e84 svn path=/nixpkgs/trunk/; revision=22880 2010-08-02 16:01:55 +00:00
Lluís Batlle i Rossell 5417c720fd Merging from trunk. 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
 2010-08-02 15:48:19 +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
Lluís Batlle i Rossell edd061b295 Making uclibc receive the proper arguments (libiconv) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22850
 2010-08-01 21:24:35 +00:00
Lluís Batlle i Rossell da3ba13fb5 Trying to make gcc 4.5 cross-buildable 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22848
 2010-08-01 21:21:26 +00:00
Lluís Batlle i Rossell 5cc46602ce Updating gettext to that decided in nixpkgs trunk (0.17 to 0.18) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22842
 2010-08-01 21:01:54 +00:00
Lluís Batlle i Rossell 8c0e984f91 The gettext update 0.18 yes builds on mips. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22841
 2010-08-01 21:00:22 +00:00
Lluís Batlle i Rossell 937578d5ef Some first changes to get some evaluation working on the fuloong2f 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22840
 2010-08-01 20:57:13 +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