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

2058 commits

Author SHA1 Message Date
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
Lluís Batlle i Rossell 3ece765eed glib: step towards cross-building it, set perl as native input. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23129
 2010-08-11 20:09:17 +00:00
Lluís Batlle i Rossell 3f05ed581f Making fossil cross-build (it works for the nanonote). 
Removing some perl scripts from the openssl cross-built derivation, to avoid depending on it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23128
 2010-08-11 20:08:29 +00:00
Rob Vermaas c441b771f4 libvirt: add python to deps so python bindings are built 
svn path=/nixpkgs/trunk/; revision=23125
 2010-08-11 18:10:03 +00:00
Rob Vermaas 53d79f6f9c updated libvirt to 0.8.3 
svn path=/nixpkgs/trunk/; revision=23124
 2010-08-11 17:55:31 +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
Yury G. Kudryashov a4829861ec Fix evaluation error 
svn path=/nixpkgs/trunk/; revision=23103
 2010-08-11 08:20:23 +00:00
Yury G. Kudryashov 7cecdce413 qt-4.7: add symlink for kde-4.5 
svn path=/nixpkgs/trunk/; revision=23100
 2010-08-10 20:18:51 +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 d5097ad3d3 Breaking dependencies on the cross-built gcc through the gcc-cross-wrapper. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23073
 2010-08-09 21:37:31 +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 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
Lluís Batlle i Rossell b45e219eec Making mesa build the DRI driver, required by the xorg server on the Fuloong2F 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23051
 2010-08-09 07:42:43 +00:00
Eelco Dolstra ab5669146d * apr 1.4.2, Apache httpd 2.2.16. 
svn path=/nixpkgs/trunk/; revision=23046
 2010-08-08 20:29:23 +00:00
Peter Simons 1a6039cb45 Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4. 
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/trunk/; revision=23042
 2010-08-08 18:51:42 +00:00
Lluís Batlle i Rossell ae3383e001 Making the cross-built packages not depend on the gcc cross compiler directly, 
but on a nix-store path only having the cross-built gcc libraries.
This trims down a lot the runtime dependency tree for cross-built packages.

I also remove the glibc dependency on the native bash.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23040
 2010-08-08 18:47:48 +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
Yury G. Kudryashov 2d9d69cb63 Add lcms2 
svn path=/nixpkgs/trunk/; revision=23012
 2010-08-06 20:23:56 +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 accda9616f heimdal: add sqlite support and install server executables to $out/sbin 
svn path=/nixpkgs/trunk/; revision=22988
 2010-08-06 08:52:47 +00:00
Eelco Dolstra 8852e08ebf * Update to SQLite 3.7.0.1, which fixes a corruption bug when the 
database is also accessed using SQLite 3.6.23.

svn path=/nixpkgs/trunk/; revision=22981
 2010-08-06 07:45:54 +00:00
Lluís Batlle i Rossell 27e2ae10a0 Making gdbm get the proper config.guess for it to build in the Fuloong 2f. 
I could not find a newer gdbm with newer config.guess.

svn path=/nixpkgs/branches/stdenv-updates/; revision=22979
 2010-08-05 22:04:10 +00:00
Lluís Batlle i Rossell 952bcf5e58 Setting the patch for the glibc locale archive, which addresses some problems 
found before:
- programs linked with this glibc, will be able to find its locale-archive
  at LOCALE_ARCHIVE_2_11
- for any problem we forgot to mention, we also add the LOCALE_ARCHIVE
  variable, checked after LOCALE_ARCHIVE_2_11. I don't know a strong reason to
  have it though.
- setuid programs will expect the locale-archive in
  /var/run/current-system/sw/lib/locale, usual path of the locale-archive in
  nixos, and a path that a sysadmin can set pointing to the locale-archive in
  case of non-nixos. setuid programs don't receive the LOCALE_ARCHIVE
  variables.
- non-nixos systems will have a check for the locale-archive in /usr/lib/locale
- the glibc programs 'locale' and 'localedef' may be able to find the proper
  locale-archive too.

We were also considering getting rid of the locale-archive, and using
locale files directly (like Ubuntu seems to do [1]), maybe using the LOCPATH
variable. But this would not solve the problem of localized setuid programs.

All this came after a 'meeting' with niksnut on irc about this.

[1] http://lwn.net/Articles/244204/

svn path=/nixpkgs/branches/stdenv-updates/; revision=22977
 2010-08-05 21:19:32 +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 b7f47c7f49 Updating libgcrypt, hoping that it will build on mips 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22972
 2010-08-05 18:47:40 +00:00
Eelco Dolstra 39a2523e79 * Glibc 2.11.2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22967
 2010-08-05 16:51:16 +00:00
Lluís Batlle i Rossell 50f337ad01 Making gcc not depend on bootstrap-tools (by a postInstall patchelf trick) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22963
 2010-08-05 13:39:08 +00:00
Eelco Dolstra 6fe628b99a * Indentation fixes. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22961
 2010-08-05 13:21:29 +00:00
Eelco Dolstra 5dc58d5c15 * SQLite updated to 3.7.0. 
svn path=/nixpkgs/trunk/; revision=22957
 2010-08-05 08:55:19 +00:00
Eelco Dolstra 9e2e347f28 * Fix Hydra evaluation. 
svn path=/nixpkgs/trunk/; revision=22955
 2010-08-05 08:38:39 +00:00
Lluís Batlle i Rossell e0a11f532b Trying to bootstrap gcc 4.5 with ppl, so it does not depend on libstdc++ from the boostrap-tools. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22947
 2010-08-04 12:36:35 +00:00
Yury G. Kudryashov ce3aef6d7b Add phonon-backend-vlc 
svn path=/nixpkgs/trunk/; revision=22939
 2010-08-04 10:04:40 +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
Lluís Batlle i Rossell 4b42d5f7a9 Fixing the openssl 1.0.0 cross build 
svn path=/nixpkgs/trunk/; revision=22910
 2010-08-02 22:10:42 +00:00
Yury G. Kudryashov aadea685af Restrict qt-4.7 to linux only 
svn path=/nixpkgs/trunk/; revision=22909
 2010-08-02 21:47:28 +00:00
Yury G. Kudryashov 230c31d020 Really make qt-4.7 
svn path=/nixpkgs/trunk/; revision=22896
 2010-08-02 17:18:56 +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
Rob Vermaas c8d53236b1 svn path=/nixpkgs/trunk/; revision=22874 2010-08-02 12:55:54 +00:00
Rob Vermaas 13cf7b0ade svn path=/nixpkgs/trunk/; revision=22872 2010-08-02 12:13:03 +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
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 878792cade Patch (already upstream on glibc master) for configure in glibc to get the gnu89-inline gcc flag right 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22844
 2010-08-01 21:03:53 +00:00
Lluís Batlle i Rossell eb7ad28899 Patches for mpfr to work on mips with gcc newer or equal to 4.4 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22843
 2010-08-01 21:02:30 +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 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 f1b8c40eb4 * Updated libogg and libvorbis. 
svn path=/nixpkgs/trunk/; revision=22838
 2010-08-01 14:33:43 +00:00
Yury G. Kudryashov 59a8bc0744 qt-4.7.0-beta2: fool phonon version 
Qt guys updated source files but not version number

svn path=/nixpkgs/trunk/; revision=22833
 2010-07-31 13:05:46 +00:00
Yury G. Kudryashov d15fdc71f0 trailing spaces 
svn path=/nixpkgs/trunk/; revision=22832
 2010-07-31 13:05:22 +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
Lluís Batlle i Rossell 8eceafc755 Fixing the name of 'confuse'; now it includes the version. 
svn path=/nixpkgs/trunk/; revision=22829
 2010-07-30 17:42:52 +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
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
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
Sander van der Burg bfbdc2db7c Stole a patch from gentoo to fix the compilation of libmsn against OpenSSL-1.0.0 
svn path=/nixpkgs/trunk/; revision=22805
 2010-07-29 09:41:29 +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 f1598a8941 * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22798
 2010-07-28 18:01:17 +00:00
Eelco Dolstra 749b8607ca * More cleanup. 
svn path=/nixpkgs/trunk/; revision=22795
 2010-07-28 15:35:01 +00:00
Peter Simons 60026c0a32 pkgs/development/libraries/crypto++: added todo note about removing cryptotest.exe from the installed image 
svn path=/nixpkgs/trunk/; revision=22790
 2010-07-28 13:08:49 +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 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
Lluís Batlle i Rossell 2c9cdbb8f2 Revert "Version update for vxl", because: 
- Although the file for 1.14 is in the upstream file repository, it's not
  published in their web, which still talks about 1.13 for the stable release.
- The cmake files comming with this vxl fail (because of some weird dependency
  on a doxygen.cmake file)

This reverts commit 22577

svn path=/nixpkgs/trunk/; revision=22750
 2010-07-27 15:57:01 +00:00
Eelco Dolstra 3c57f1fd8a * Fix zlib 1.2.5 on Cygwin. (The Makefile doesn't support building 
just a static library.)

svn path=/nixpkgs/trunk/; revision=22748
 2010-07-27 11:37:29 +00:00
Eelco Dolstra 228c6e0c1f * Merged the x-updates branch (latest X server / libraries, GTK+, 
Fontconfig, etc.).

svn path=/nixpkgs/trunk/; revision=22735
 2010-07-26 13:59:12 +00:00
Eelco Dolstra 4a6eb1183e * On x86_64-darwin, "./config" misdetects the system as 
"darwin-i386-cc" (http://hydra.nixos.org/build/498076).  So specify
  the system type explicitly.

svn path=/nixpkgs/branches/x-updates/; revision=22726
 2010-07-25 09:09:32 +00:00
Eelco Dolstra 3587a2f78e * Doh. 
svn path=/nixpkgs/branches/x-updates/; revision=22723
 2010-07-23 15:36:35 +00:00
Eelco Dolstra 07afe31016 * Doh, we already had OpenSSL 1.0.0. Use the updated Darwin patch. 
svn path=/nixpkgs/branches/x-updates/; revision=22722
 2010-07-23 15:05:20 +00:00
Andres Löh 73bee7da33 Switched the default version of ghc and Haskell Platform to 6.12.3 and 2010.2.0.0. 
svn path=/nixpkgs/trunk/; revision=22715
 2010-07-22 18:47:59 +00:00
Andres Löh 6c90771ac6 * Updated darcs to 2.4.4. 
* Added Haskell Platform 2010.2.0.0.
* Added cairo package in preparation for adding a new gtk2hs.

svn path=/nixpkgs/trunk/; revision=22714
 2010-07-22 18:04:39 +00:00
Eelco Dolstra b33d41ef08 * clutter-gtk updated to 0.10.4 so that it builds against the current 
GTK+ (http://hydra.nixos.org/build/495170).  

svn path=/nixpkgs/branches/x-updates/; revision=22711
 2010-07-22 14:08:44 +00:00
Eelco Dolstra 0db478d40b * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=22707
 2010-07-22 13:18:07 +00:00
Ludovic Courtès 80bcec77ec libevent 1.4.14b. 
svn path=/nixpkgs/trunk/; revision=22697
 2010-07-22 09:02:13 +00:00
Andres Löh df9f4a8696 Added a couple of web-programming-related Haskell packages. 
svn path=/nixpkgs/trunk/; revision=22683
 2010-07-21 09:41:12 +00:00
Eelco Dolstra 78a5abdf85 * Updated the X.org server to 1.8.2. Note that it no longer depends 
on HAL but instead uses udev to autoconfigure input devices.  We'll
  have to update the NixOS X server module accordingly, I guess.  See
  https://fedoraproject.org/wiki/Input_device_configuration.
* Updated Mesa to 7.8.2.

svn path=/nixpkgs/branches/x-updates/; revision=22681
 2010-07-20 19:24:21 +00:00
Peter Simons aec027e2ec pkgs/development/libraries/ncurses: enable parallel building for ncurses 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22674
 2010-07-20 13:14:03 +00:00
Eelco Dolstra 0f53a3fca8 * Ignore missing directories in the <includedir> element. This allows 
the NixOS system bus configuration to include directories such as

    /nix/var/nix/profiles/default/etc/dbus-1/system.d/

  which may not exist.

svn path=/nixpkgs/branches/x-updates/; revision=22672
 2010-07-20 12:53:07 +00:00
Eelco Dolstra cceb5bcf80 * Work around (temporarily?) broken URL. 
svn path=/nixpkgs/branches/x-updates/; revision=22669
 2010-07-19 23:24:16 +00:00
Eelco Dolstra 9909fdbbd6 * Fix evaluation problems. 
svn path=/nixpkgs/branches/x-updates/; revision=22668
 2010-07-19 22:24:26 +00:00
Eelco Dolstra b8928b09fd * Okay, make zlib a propagated build input of glib. 
svn path=/nixpkgs/branches/x-updates/; revision=22666
 2010-07-19 11:43:45 +00:00
Eelco Dolstra 7d963c8bb3 * By default, OpenSSL on 64-bit platforms now installs libraries in 
$out/lib64, which is not what we want.

svn path=/nixpkgs/branches/x-updates/; revision=22661
 2010-07-19 10:27:46 +00:00
Eelco Dolstra fbf2ed6067 * Remove MD2 support from Heimdal because OpenSSL 1.0.0 no longer has 
it.  See also
  2a842e90d3

svn path=/nixpkgs/branches/x-updates/; revision=22657
 2010-07-19 08:39:02 +00:00
Eelco Dolstra cb4a883683 * Update libxml2 to 2.7.7. This is necessary because of the zlib 
update - xsltproc segfaults otherwise.  (From the release notes:
  "libxml violates the zlib interface and crashes".)

svn path=/nixpkgs/branches/x-updates/; revision=22655
 2010-07-19 08:17:42 +00:00
Eelco Dolstra 0695a9707c * GTK+ 2.20, Glib 2.24 etc. 
svn path=/nixpkgs/branches/x-updates/; revision=22652
 2010-07-18 23:22:59 +00:00
Eelco Dolstra 962276dd49 * dbus-glib updated to 0.86. 
svn path=/nixpkgs/branches/x-updates/; revision=22651
 2010-07-18 23:22:20 +00:00
Ludovic Courtès cd06afd761 Add libchamplain, a library to display maps. 
svn path=/nixpkgs/trunk/; revision=22649
 2010-07-18 22:46:19 +00:00
Ludovic Courtès cbd5317e82 Add Clutter{,-GTK}, a library for fancy GUIs. 
svn path=/nixpkgs/trunk/; revision=22648
 2010-07-18 22:45:03 +00:00
Eelco Dolstra d514ac437a * Dbus updated to 1.2.24. 
svn path=/nixpkgs/branches/x-updates/; revision=22646
 2010-07-18 22:00:40 +00:00
Eelco Dolstra 26521d42e2 * gtkLibs218 updated (glib-2.22.5, gtk+-2.18.9). 
svn path=/nixpkgs/branches/x-updates/; revision=22645
 2010-07-18 21:56:12 +00:00
Eelco Dolstra 02d85d19a2 * Fontconfig updated to 2.8.0. 
svn path=/nixpkgs/branches/x-updates/; revision=22644
 2010-07-18 21:55:31 +00:00
Eelco Dolstra 70ab33568d * Cairo updated to 1.8.10. 
svn path=/nixpkgs/branches/x-updates/; revision=22643
 2010-07-18 21:55:12 +00:00
Eelco Dolstra 65d9c03c9a * libdrm updated to 2.4.21. 
svn path=/nixpkgs/branches/x-updates/; revision=22642
 2010-07-18 21:54:57 +00:00
Eelco Dolstra 6b79040a0b * libpng updated to 1.2.44. 
svn path=/nixpkgs/branches/x-updates/; revision=22641
 2010-07-18 21:54:42 +00:00
Eelco Dolstra 964c3d351f * libtiff updated to 3.9.4. 
svn path=/nixpkgs/branches/x-updates/; revision=22640
 2010-07-18 21:54:28 +00:00
Eelco Dolstra d06a183365 * OpenSSL updated to 1.0.0a. 
svn path=/nixpkgs/branches/x-updates/; revision=22639
 2010-07-18 21:54:14 +00:00
Eelco Dolstra ef8bf2b077 * FreeType updated to 2.4.1. Note that the bytecode interpreter 
patent has expired, so TT_CONFIG_OPTION_BYTECODE_INTERPRETER is now
  the default.  Whether it looks better now is subjective.

svn path=/nixpkgs/branches/x-updates/; revision=22638
 2010-07-18 21:53:58 +00:00
Eelco Dolstra b7324318cf * zlib updated to 1.2.5. 
svn path=/nixpkgs/branches/x-updates/; revision=22637
 2010-07-18 21:52:39 +00:00
Eelco Dolstra e0dd4232e1 * libjpeg updated to v8b. 
svn path=/nixpkgs/branches/x-updates/; revision=22634
 2010-07-18 21:51:53 +00:00
Andres Löh 5bd2be1d12 Version bump for regular library (Haskell). 
svn path=/nixpkgs/trunk/; revision=22626
 2010-07-18 18:29:05 +00:00