Yury G. Kudryashov
64cff1da4e
Add calibreQt46. Please, test
...
svn path=/nixpkgs/trunk/; revision=21014
2010-04-11 18:58:43 +00:00
Yury G. Kudryashov
a60cdda3c6
Remove qt-4.4
...
svn path=/nixpkgs/trunk/; revision=21012
2010-04-11 17:29:36 +00:00
Yury G. Kudryashov
f25c68f01a
Remove old kde packages
...
svn path=/nixpkgs/trunk/; revision=21011
2010-04-11 15:50:41 +00:00
Yury G. Kudryashov
eb20e3b926
Add gpm support to elinks
...
svn path=/nixpkgs/trunk/; revision=21003
2010-04-10 20:27:02 +00:00
Yury G. Kudryashov
22bc695075
Use package overrides instead of getConfig
...
svn path=/nixpkgs/trunk/; revision=21002
2010-04-10 20:26:54 +00:00
Yury G. Kudryashov
9cef0c7941
Update linuxwacom, add 0.8.4.x
...
svn path=/nixpkgs/trunk/; revision=21001
2010-04-10 20:26:41 +00:00
Lluís Batlle i Rossell
a2334e604b
Adding slimrat (not the gui, but at least the cli)
...
svn path=/nixpkgs/trunk/; revision=20999
2010-04-10 10:47:30 +00:00
Lluís Batlle i Rossell
2f67d3cc66
Updating boost.
...
Maybe we want a 'default.nix' reflecting the latest version, instead of changing and changing the version?
svn path=/nixpkgs/trunk/; revision=20995
2010-04-09 15:40:18 +00:00
Ludovic Courtès
7f6b1e9abd
GCC 4.4: Fix shared library support of sparc64-linux-gnu cross-compiler.
...
svn path=/nixpkgs/trunk/; revision=20975
2010-04-07 15:53:34 +00:00
Lluís Batlle i Rossell
3c2c4ac87a
Adding 'meld'
...
svn path=/nixpkgs/trunk/; revision=20963
2010-04-06 19:39:29 +00:00
Yury G. Kudryashov
99fda7a42f
Do not pass pkgs to virtuoso
...
svn path=/nixpkgs/trunk/; revision=20958
2010-04-06 13:27:32 +00:00
Eelco Dolstra
2aac41a8db
* libiodbc: don't pass all of Nixpkgs to the package. There is no
...
reason why this shouldn't work, but it breaks NixOS evaluation on
x86_64-linux with weird segfaults and assertion failures, probably
due to a bug in the evaluator or the ATerm library.
svn path=/nixpkgs/trunk/; revision=20953
2010-04-06 10:50:52 +00:00
Lluís Batlle i Rossell
bb8a2181ad
Updating kismet
...
svn path=/nixpkgs/trunk/; revision=20934
2010-04-03 22:07:59 +00:00
Yury G. Kudryashov
d22cb2fdb5
Add virtuoso database
...
Very minimal installation needed by KDE
svn path=/nixpkgs/trunk/; revision=20932
2010-04-03 17:34:14 +00:00
Lluís Batlle i Rossell
fd94e443d2
Adding recurseIntoAttrs for the kde3 attribute set, to have the derivations available listed
...
by nix-env.
svn path=/nixpkgs/trunk/; revision=20931
2010-04-03 10:59:26 +00:00
Yury G. Kudryashov
f0f1958830
Get rid of redland-1.0.8
...
1.0.9 was buggy, but it is fixed in 1.0.10
svn path=/nixpkgs/trunk/; revision=20930
2010-04-03 09:54:22 +00:00
Yury G. Kudryashov
e523ba1732
Add libiodbc
...
Use experimental style. Will revert to "standard" one if needed.
svn path=/nixpkgs/trunk/; revision=20929
2010-04-03 09:53:38 +00:00
Yury G. Kudryashov
c3e38d11f0
Bump libarchive to 2.8.3
...
Fixes kdeutils-4.4.2 compilation
svn path=/nixpkgs/trunk/; revision=20922
2010-04-01 18:50:43 +00:00
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
Yury G. Kudryashov
16ef66f67e
Recurse into kde4 attrs
...
svn path=/nixpkgs/trunk/; revision=20912
2010-04-01 14:21:18 +00:00
Yury G. Kudryashov
5306038df7
Move KDE 3 packages into kde3 set
...
Use kde3.kile instead of kile etc.
svn path=/nixpkgs/trunk/; revision=20910
2010-04-01 13:34:36 +00:00
Yury G. Kudryashov
f26e437b72
Don't depend on X unless djview3 is requested
...
Also rename option name to "qt3"
svn path=/nixpkgs/trunk/; revision=20908
2010-04-01 12:34:50 +00:00
Ludovic Courtès
c936e89fc1
aMule 2.2.6.
...
svn path=/nixpkgs/trunk/; revision=20866
2010-03-30 08:20:29 +00:00
Marc Weber
3a94c410d1
add perlcritic 1.105 (and Test::Perl::Critic 1.02) and some depndencies:
...
total perl libs added: BKeywords ConfigTiny ExceptionClass FileRemove FileWhich HookLexWrap IOString IPCRun3 PerlCritic PerlTidy PPI PodSpell ProbePerl ReadonlyXS RegexpParser StringFormat TestObject TestPerlCritic TestScript TestSubCalls
patch provided by Francois Perrad
svn path=/nixpkgs/trunk/; revision=20865
2010-03-29 23:36:40 +00:00
Marc Weber
ec095c9145
add ack-1.92
...
patch provided by Francois Perrad
svn path=/nixpkgs/trunk/; revision=20864
2010-03-29 23:36:38 +00:00
Marc Weber
1d5910bb94
add Gradle 0.8
...
patch provided by Francois Perrad
svn path=/nixpkgs/trunk/; revision=20863
2010-03-29 23:36:35 +00:00
Marc Weber
7b5896ca33
add Groovy 1.7.1
...
patch provided by Francois Perrad
svn path=/nixpkgs/trunk/; revision=20862
2010-03-29 23:36:32 +00:00
Lluís Batlle i Rossell
946ca82173
Making ikiwiki happier with LocaleGettext
...
svn path=/nixpkgs/trunk/; revision=20845
2010-03-28 22:54:10 +00:00
Alexander Tsamutali
99f19e27de
applications/networking/p2p/transmission: New nixpkg.
...
svn path=/nixpkgs/trunk/; revision=20840
2010-03-28 00:06:30 +00:00
Rob Vermaas
4003f1e6fe
nixpkgs: for darwin redirect jdk to openjdk
...
svn path=/nixpkgs/trunk/; revision=20832
2010-03-26 13:31:11 +00:00
Eelco Dolstra
54aefa41b4
* aangifte2009 requires xdg-utils to open a browser.
...
svn path=/nixpkgs/trunk/; revision=20830
2010-03-25 20:39:01 +00:00
Eelco Dolstra
48e1c2df80
* Added xdg-utils, a package that contains desktop integration
...
commands such as `xdg-open' (which opens a URL with the user's
default browser).
svn path=/nixpkgs/trunk/; revision=20829
2010-03-25 19:48:06 +00:00
Eelco Dolstra
25ea790dd4
* Added the Dutch Tax Return program for 2009.
...
svn path=/nixpkgs/trunk/; revision=20828
2010-03-25 19:40:19 +00:00
Lluís Batlle i Rossell
d533e31357
Updating gtkwave
...
svn path=/nixpkgs/trunk/; revision=20825
2010-03-25 15:07:53 +00:00
Eelco Dolstra
806099dbc8
* Added GNU wdiff.
...
svn path=/nixpkgs/trunk/; revision=20817
2010-03-25 11:51:55 +00:00
Lluís Batlle i Rossell
a991201bf5
Adding optipng, and a basic expression for pdfread.
...
svn path=/nixpkgs/trunk/; revision=20802
2010-03-23 23:04:41 +00:00
Lluís Batlle i Rossell
60b8b2b613
Adding pngnq.
...
svn path=/nixpkgs/trunk/; revision=20801
2010-03-23 22:40:46 +00:00
Lluís Batlle i Rossell
54ccfcff2d
Updating calibre (now, with chm support)
...
svn path=/nixpkgs/trunk/; revision=20797
2010-03-23 21:48:38 +00:00
Eelco Dolstra
9dd466d123
* Updated pyqt and sip because the old versions have disappeared.
...
* Removed some unused versions of those packages.
* Don't pass `lib' to packages (because we already have `stdenv.lib').
* Removed some `*_python26' variants because Python 2.6 is the default
now.
svn path=/nixpkgs/trunk/; revision=20782
2010-03-23 14:04:47 +00:00
Ludovic Courtès
6574a35e56
Add MIT/GNU Scheme.
...
svn path=/nixpkgs/trunk/; revision=20719
2010-03-17 15:32:12 +00:00
Ludovic Courtès
d5c0333db8
Stalin: Add dependency on ncompress.
...
svn path=/nixpkgs/trunk/; revision=20713
2010-03-17 14:44:46 +00:00
Eelco Dolstra
8396168276
* Updated Nix to 0.15.
...
svn path=/nixpkgs/trunk/; revision=20697
2010-03-17 12:16:03 +00:00
Lluís Batlle i Rossell
4824ecbb62
Trying to remove more hydra evaluation errors related to gcc.
...
svn path=/nixpkgs/trunk/; revision=20687
2010-03-17 10:17:32 +00:00
Lluís Batlle i Rossell
f0ce6cfe94
Trying to remove evaluation errors in hydra nixpkgs for the cross compiler related
...
derivations.
I remove their 'meta platforms' attribute, defined in the gcc expression, so hydra
does not attempt to build them in the nixpkgs evaluation.
svn path=/nixpkgs/trunk/; revision=20678
2010-03-17 09:05:11 +00:00
Michael Raskin
1163f22972
Add 2.6.33-zen1 kernels
...
svn path=/nixpkgs/trunk/; revision=20676
2010-03-17 06:42:21 +00:00
Marc Weber
19f0cd20fd
HaXe: support nekotools boot - add haxelib
...
svn path=/nixpkgs/trunk/; revision=20674
2010-03-16 23:34:56 +00:00
Lluís Batlle i Rossell
23809aa681
Trying to fix the nixpkgs-tarball, after I broke it again due to assuming
...
'gcc' to be pure as that of stdenvLinux.
svn path=/nixpkgs/trunk/; revision=20671
2010-03-16 21:53:48 +00:00
Lluís Batlle i Rossell
dd4ad6741e
Fixing once again the ld-wrapper.sh script. I put it in a gcc-wrapper apart, to be removed
...
on the next stdenv-updates.
This would fix the build for many cmake packages, although that requires updating the stdenv
in those for its gcc to use this 2nd wrapper.
I updated paraview and avidemux. I can't recall now more packages with problems, but I was
quite sure there were.
If anyone sees a cmake-built package with the result binaries lacking some rpaths, then try
this wrapper.
svn path=/nixpkgs/trunk/; revision=20669
2010-03-16 20:49:26 +00:00
Lluís Batlle i Rossell
d1217f68a4
Reverting eelco's r20469, which was applied due to a misunderstanding with an hydra build.
...
kde44 has worked well enough then and since then.
svn path=/nixpkgs/trunk/; revision=20668
2010-03-16 18:57:17 +00:00
Peter Simons
b6d6f301c4
pkgs/applications/editors/emacs-modes/magit: updated to version magit-0.7-94-gbf42bf8
...
Magit has seen plenty of development since version 0.7, but for some reason
there haven't been any new releases. This version bump updates the expression to
build a current version of Magit directly from the Git repository.
This change adds buildInputs 'autoconf' and 'automake'. These tools are required
only because we aren't building from a proper release tarball. Once version 0.8
comes out, these dependencies can be dropped again.
svn path=/nixpkgs/trunk/; revision=20650
2010-03-16 12:13:40 +00:00
Rob Vermaas
891bf14096
also make python 26 default on darwin
...
svn path=/nixpkgs/trunk/; revision=20642
2010-03-16 09:12:26 +00:00
Lluís Batlle i Rossell
f68b2277b7
Adding qshowdiff.
...
svn path=/nixpkgs/trunk/; revision=20633
2010-03-15 14:26:52 +00:00
Lluís Batlle i Rossell
648b17197f
Adding linux 2.4 kernel headers for cross builds.
...
(I'm thinking of OpenWRT machines out there, mips, with linux 2.4)
svn path=/nixpkgs/trunk/; revision=20539
2010-03-10 20:44:48 +00:00
Lluís Batlle i Rossell
57ea53f67a
Adding rapidsvn
...
svn path=/nixpkgs/trunk/; revision=20538
2010-03-10 20:44:40 +00:00
Lluís Batlle i Rossell
12e960f592
Adding dropbear, a small implementation of ssh2 client and server.
...
I made it statically build by default
I had to fix the zlib static cross-build, because the native stripping corrupted the target
static library. It is not the first time I see this.
I add drobear to the cross-built packages for hydra.
svn path=/nixpkgs/trunk/; revision=20518
2010-03-09 23:11:12 +00:00
Lluís Batlle i Rossell
33e549fa4f
Adding a busybox option to build it statically.
...
Adding it to the cross builds.
svn path=/nixpkgs/trunk/; revision=20516
2010-03-09 22:44:45 +00:00
Lluís Batlle i Rossell
d2b237ba51
Adding ired, a 'radare' simplification: Interactive Raw Editor.
...
svn path=/nixpkgs/trunk/; revision=20511
2010-03-09 18:14:59 +00:00
Lluís Batlle i Rossell
804f4bed92
Fixing the evaluation of trunk (regarding reenabling uclibc cross builds)
...
svn path=/nixpkgs/trunk/; revision=20509
2010-03-09 18:05:33 +00:00
Lluís Batlle i Rossell
1522caa556
Enabling cross-builds with uclibc again (I had that too much abandoned).
...
Hydra now should even test it.
svn path=/nixpkgs/trunk/; revision=20500
2010-03-09 15:48:25 +00:00
Eelco Dolstra
c7b9e45e76
* Added s3sync.
...
svn path=/nixpkgs/trunk/; revision=20496
2010-03-09 15:12:15 +00:00
Eelco Dolstra
8d8e6f7e4c
* Mark nixSqlite as low priority to prevent it from being installed
...
accidentally.
svn path=/nixpkgs/trunk/; revision=20481
2010-03-09 08:45:20 +00:00
Eelco Dolstra
4983b6d87c
* Revert to KDE 4.3 because there are build errors
...
(e.g. http://hydra.nixos.org/build/314745 )
svn path=/nixpkgs/trunk/; revision=20469
2010-03-08 10:29:20 +00:00
Lluís Batlle i Rossell
4e59f00501
I added again nasm as lrzip input. It is required in i686-linux at least.
...
svn path=/nixpkgs/trunk/; revision=20467
2010-03-07 22:46:29 +00:00
Lluís Batlle i Rossell
7a2ad368f9
Updating lrzip. It does not depend on nasm anymore.
...
svn path=/nixpkgs/trunk/; revision=20463
2010-03-07 21:03:50 +00:00
Lluís Batlle i Rossell
7858a1d7d8
Adding assertions for the cross-toolchain attributes, so noone feels tempted
...
to build them without setting a crossSystem to build for.
svn path=/nixpkgs/trunk/; revision=20459
2010-03-07 00:05:51 +00:00
Lluís Batlle i Rossell
dddd34bc4e
Updating qemu.
...
svn path=/nixpkgs/trunk/; revision=20458
2010-03-06 23:37:01 +00:00
Lluís Batlle i Rossell
012e7f196e
I removed the function-shape of the cross-toolchain related attributes in the all-packages.nix.
...
That was more complicating than helping.
svn path=/nixpkgs/trunk/; revision=20457
2010-03-06 23:36:55 +00:00
Lluís Batlle i Rossell
48fa4b5257
Updating dwm, and allowing users set their own patches to configure it.
...
svn path=/nixpkgs/trunk/; revision=20437
2010-03-05 21:49:29 +00:00
Lluís Batlle i Rossell
ca86e6992b
Updating dmenu.
...
svn path=/nixpkgs/trunk/; revision=20436
2010-03-05 21:42:24 +00:00
Sander van der Burg
f788ae920d
Changed KDE 4.4.x to the default KDE version. Changed qt-4.6.x to the default qt4 version (except for the KDE 4.3.x attribute and older PyQt releases
...
svn path=/nixpkgs/trunk/; revision=20404
2010-03-05 12:00:37 +00:00
Lluís Batlle i Rossell
4523a86c92
Adding the awesome man pages.
...
svn path=/nixpkgs/trunk/; revision=20394
2010-03-05 09:52:53 +00:00
Lluís Batlle i Rossell
40d3c2f29a
Adding graphicsmagick 1.3.7 for octave imread() and alike to work.
...
svn path=/nixpkgs/trunk/; revision=20390
2010-03-04 16:41:14 +00:00
Lluís Batlle i Rossell
ba274e578c
Made graphicsmagick-config not say anything about libraries that would be needed for static linking, because we are linking it dynamically.
...
Made octave link with graphicsmagick to get imread() working.
Nevertheless, imread does not work, because of some problems between octave and latest versions of graphicsmagick: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html
Next to do: add an older version of graphics magick for octave.
svn path=/nixpkgs/trunk/; revision=20389
2010-03-04 16:41:10 +00:00
Lluís Batlle i Rossell
22065c11d9
Adding 'awesome' (and two packages it was depending on)
...
svn path=/nixpkgs/trunk/; revision=20385
2010-03-04 14:44:56 +00:00
Lluís Batlle i Rossell
aa38df2611
Adding GraphicsMagick
...
svn path=/nixpkgs/trunk/; revision=20383
2010-03-04 14:44:47 +00:00
Lluís Batlle i Rossell
c2cbd65668
Getting a better seg3d build. Now it runs from TMPDIR at least.
...
The installation still fails.
svn path=/nixpkgs/trunk/; revision=20382
2010-03-04 14:44:43 +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
Ludovic Courtès
07356746ef
Add GNU cppi.
...
svn path=/nixpkgs/trunk/; revision=20363
2010-03-04 11:10:44 +00:00
Ludovic Courtès
344f2efc5f
libcanberra 0.23.
...
svn path=/nixpkgs/trunk/; revision=20353
2010-03-03 14:27:17 +00:00
Sander van der Burg
e51cfc777a
Added libv4l which is now a required dependency for kdenetwork-4.4.1
...
svn path=/nixpkgs/trunk/; revision=20349
2010-03-03 10:37:38 +00:00
Rob Vermaas
af2f53ab89
hydra-ant-logger
...
svn path=/nixpkgs/trunk/; revision=20332
2010-03-02 15:37:04 +00:00
Lluís Batlle i Rossell
cc068f0be8
Adding the itk libraries.
...
Adding a skeleton of the seg3d package. It builds, but libraries and rpaths are wrong.
I hope to fix it soon.
svn path=/nixpkgs/trunk/; revision=20320
2010-03-01 23:31:35 +00:00
Lluís Batlle i Rossell
eb047010f8
Trying to get a better expression for uboot upstream, allowing normal and cross build
...
with proper assertions.
svn path=/nixpkgs/trunk/; revision=20319
2010-03-01 23:22:48 +00:00
Ludovic Courtès
a86e0ad8aa
pyopengl: Move to `python-packages.nix'.
...
svn path=/nixpkgs/trunk/; revision=20317
2010-03-01 17:08:25 +00:00
Rob Vermaas
f3f922f474
ecj for darwin
...
svn path=/nixpkgs/trunk/; revision=20311
2010-03-01 16:20:47 +00:00
Ludovic Courtès
67b7a89daf
Move zope.interface' to
python-packages.nix'.
...
svn path=/nixpkgs/trunk/; revision=20305
2010-03-01 13:12:52 +00:00
Ludovic Courtès
ff88e57803
GNU Parted 2.2.
...
svn path=/nixpkgs/trunk/; revision=20304
2010-03-01 13:12:48 +00:00
Lluís Batlle i Rossell
b7abafeedc
Adding a new python package to allow calibre preview the books
...
svn path=/nixpkgs/trunk/; revision=20292
2010-02-28 22:55:08 +00:00
Lluís Batlle i Rossell
30a9cbf018
Updating calibre (I had to add a new python package for it: cssutils)
...
svn path=/nixpkgs/trunk/; revision=20291
2010-02-28 22:42:39 +00:00
Lluís Batlle i Rossell
305a7a2ddf
More testing allows fixing more errors from the recent commits.
...
svn path=/nixpkgs/trunk/; revision=20279
2010-02-27 21:21:20 +00:00
Lluís Batlle i Rossell
4677180b0d
Barf. I have to test the expressions before commiting.
...
svn path=/nixpkgs/trunk/; revision=20278
2010-02-27 20:37:58 +00:00
Lluís Batlle i Rossell
81b325b33f
Adding a cross compiler condition for sparc64 due to a gcc bug
...
svn path=/nixpkgs/trunk/; revision=20277
2010-02-27 20:29:39 +00:00
Lluís Batlle i Rossell
11aa65c28a
Simplified much more the expressions for cross building and multiplatform.
...
I introduce the new nixpkgs parameter "platform", defaulting to "pc",
which was before defined as an attribute of nixpkgs.
I made the crossSystem nixpkgs attribute set parameter contain its own 'platform'.
This allows cross-building a kernel for a given crossSystem.platform in a non-PC
platform.
The actual native platform can be taken from stdenv.platform, and this way we also
avoid the constant passing of 'platform' to packages for platform-dependant builds
(kernel, initrd, ...).
I will update nixos accordingly to these changes, for non-PC platforms to work.
I think we are gaining on flexibility and clearness. I could cross build succesfully
an ultrasparc kernel and a mipsel kernel on PC. But since this change, I should be able
to do this also in non-PC.
Before this change, there was no possibility of distinguishing the "target platform" or
the "native build platform" when cross building, being the single "platform" attribute
always interpreted as target platform.
The platform is a quite relevant attribute set, as it determines the linuxHeaders used
(in the case, by now the only one supported, of linux targets).
The platform attributes are quite linux centric still. Let's hope for more generality to come.
svn path=/nixpkgs/trunk/; revision=20273
2010-02-27 17:35:47 +00:00
Lluís Batlle i Rossell
b1b7266aa3
After some testing with an ultrasparc cross-compiler:
...
Updating the cross-build expressions, adding some flexibility.
Updated the linux headers used cross building, as 2.6.28 had bugs on endianness in
sparc64.
There were, as usual some bugs in gcc. Maybe not many make a cross compiler to
ultrasparc.
For the record, I could build an ultrasparc kernel with this base nix:
import /etc/nixos/nixpkgs/default.nix # The root nixpkgs default.nix
{
crossSystem = {
config = "sparc64-unknown-linux";
bigEndian = true;
arch = "sparc64";
float = "soft";
withTLS = true;
cpu = "ultrasparc";
};
config = pkgs: {
packageOverrides = pkgs : {
platform = {
name = "sparc64";
kernelHeadersBaseConfig = "sparc64_defconfig";
kernelBaseConfig = "sparc64_defconfig";
kernelArch = "sparc";
kernelAutoModules = false;
kernelTarget = "zImage";
uboot = null;
};
};
};
}
Although it did not boot directly in qemu-system-sparc64:
[sparc64] Kernel already loaded
Unhandled Exception 0x0000000000000020
PC = 0x0000000000404000 NPC = 0x0000000000404004
svn path=/nixpkgs/trunk/; revision=20269
2010-02-27 00:52:48 +00:00
Eelco Dolstra
61c9c2434f
* Updated fbcondecor for Linux 2.6.33.
...
svn path=/nixpkgs/trunk/; revision=20257
2010-02-25 14:15:42 +00:00
Rob Vermaas
e9404a5d83
* remove sawmill
...
svn path=/nixpkgs/trunk/; revision=20252
2010-02-25 13:28:36 +00:00
Eelco Dolstra
e04c9a452a
* Linux 2.6.33.
...
svn path=/nixpkgs/trunk/; revision=20246
2010-02-25 12:40:03 +00:00
Rob Vermaas
c4332bb7a1
nix 0.15pre20231 as nixUnstable
...
svn path=/nixpkgs/trunk/; revision=20243
2010-02-25 10:01:33 +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
Michael Raskin
7ec7268649
Added Clozure CL
...
svn path=/nixpkgs/trunk/; revision=20211
2010-02-24 09:04:29 +00:00