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

495 commits

Author SHA1 Message Date
Ludovic Courtès 05b8ee73c4 OpenOCD: Comment on the pitiful GuruPlug situation. 
svn path=/nixpkgs/trunk/; revision=24059
 2010-10-04 22:23:37 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
 2010-10-03 09:25:34 +00:00
Yury G. Kudryashov 76b211a81f More homepages 
svn path=/nixpkgs/trunk/; revision=23973
 2010-09-27 18:41:59 +00:00
Peter Simons f492f1a989 pkgs/development/tools/misc/gdb: add support for scripting in Python 
svn path=/nixpkgs/trunk/; revision=23966
 2010-09-27 13:31:46 +00:00
Lluís Batlle i Rossell 2c5de61327 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
 2010-09-17 19:10:21 +00:00
Ludovic Courtès e9dc9a374a GDB 7.2. 
svn path=/nixpkgs/trunk/; revision=23647
 2010-09-05 15:19:07 +00:00
Lluís Batlle i Rossell 641f956581 Setting any stdenv.system references for the loongson2f system to 'mips64-linux'. 
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/firefox/3.6.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=23588
 2010-09-01 09:50:12 +00:00
Lluís Batlle i Rossell 8a59e608aa Setting the new binutils snapshot niksnut copied to nixos.org, for the time while they don't 
release.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23587
 2010-09-01 09:49:53 +00:00
Eelco Dolstra 43ac966abb * lsof 4.84, psmisc 22.12. 
svn path=/nixpkgs/trunk/; revision=23537
 2010-08-29 23:22:26 +00:00
Lluís Batlle i Rossell 191961aa76 Typo 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23324
 2010-08-21 17:18:35 +00:00
Lluís Batlle i Rossell 508fc749f4 Making texinfo look nicer related to cross-build (we had some cleaning up to do for the time when we rebuild stdenv. It looks like a good time for that) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23316
 2010-08-21 16:57:24 +00:00
Lluís Batlle i Rossell ff0b54e26e Patching the latest gnum4 so it builds with glibc 2.12.1 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23306
 2010-08-21 13:03:36 +00:00
Ludovic Courtès 42db762862 GNU Libtool 2.2.10. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23277
 2010-08-20 15:26:21 +00:00
Lluís Batlle i Rossell f16353b6f2 Updated from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
 2010-08-20 13:41:12 +00:00
Lluís Batlle i Rossell f8f53855d5 Setting a snapshot of unreleased binutils for the fuloong2f 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23273
 2010-08-20 13:29:57 +00:00
Ludovic Courtès c8b7ed425b GNU Autoconf 2.67. 
svn path=/nixpkgs/trunk/; revision=23260
 2010-08-19 16:58:08 +00:00
Peter Simons 961fda939c Fix some broken URLs. 
svn path=/nixpkgs/trunk/; revision=23152
 2010-08-12 14:56:14 +00:00
Lluís Batlle i Rossell e97ad11560 Making cscope cross build (avoiding emacs in it) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23127
 2010-08-11 20:07:22 +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
Michael Raskin be3d5d3496 Update elfutils: the old ones are inaccessible, and too old to be found on other mirrors 
svn path=/nixpkgs/trunk/; revision=23058
 2010-08-09 15:37:14 +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
Lluís Batlle i Rossell 4b79027f45 Updating the patchelf0.6 reference, so it gets the changes to work in mips 
(16KiB pages)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22853
 2010-08-01 21:26:10 +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
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 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
Rob Vermaas 94bf409baf updated patchelf 0.6 source to a link that should not be garbage collected 
svn path=/nixpkgs/trunk/; revision=22556
 2010-07-12 10:09:09 +00:00
Michael Raskin 7c5e566c5c Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed. 
svn path=/nixpkgs/trunk/; revision=22539
 2010-07-08 19:22:50 +00:00
Michael Raskin ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense. 
svn path=/nixpkgs/trunk/; revision=22529
 2010-07-08 13:25:52 +00:00
Rob Vermaas 78ba3b5d01 autoconf: use stdenv.system in stead of builtins.currentSystem for doCheck 
svn path=/nixpkgs/trunk/; revision=22506
 2010-07-07 11:42:04 +00:00
Rob Vermaas e230d213fa Reverted autoconf to 2.65 because it has some regressions regarding AC_CHECK_SIZEOF. 
This break almost all stratego based packages. No final patch available, see 
http://lists.gnu.org/archive/html/autoconf/2010-07/msg00004.html for more info.


svn path=/nixpkgs/trunk/; revision=22504
 2010-07-07 09:59:33 +00:00
Ludovic Courtès 45458141ea GNU Automake 1.11: Fix sloppy tests. 
svn path=/nixpkgs/trunk/; revision=22481
 2010-07-05 15:55:52 +00:00
Ludovic Courtès 9df792c440 GNU Autoconf 2.66. 
svn path=/nixpkgs/trunk/; revision=22459
 2010-07-04 21:10:44 +00:00
David Guibert d877915489 ccache: 3.0 
svn path=/nixpkgs/trunk/; revision=22422
 2010-06-26 14:23:28 +00:00
Lluís Batlle i Rossell 86345919c2 Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
 2010-06-14 09:28:10 +00:00
Ludovic Courtès 80e7412199 sloccount: Fix non-determinism due to timestamps. 
svn path=/nixpkgs/trunk/; revision=22077
 2010-06-01 10:13:25 +00:00
Lluís Batlle i Rossell fa1a414aee Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that 
well


svn path=/nixpkgs/branches/stdenv-updates/; revision=21975
 2010-05-25 20:38:18 +00:00
Ludovic Courtès 5ecaa9ab32 GNU MIG: Move to `os-specific/gnu'. 
svn path=/nixpkgs/trunk/; revision=21894
 2010-05-19 21:27:53 +00:00
Ludovic Courtès eeba31dfc9 GNU MIG: Use the date as the version number; remove misguided cross stuff. 
svn path=/nixpkgs/trunk/; revision=21893
 2010-05-19 21:27:38 +00:00
Lluís Batlle i Rossell 6d88da9a23 Merging from trunk (conflict on glibc, I think I resolved it) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
 2010-05-19 15:26:00 +00:00
Rob Vermaas a07cdd3b23 * added patchelf pre-release 0.6 until it gets stable 
* updated chrome to latest version


svn path=/nixpkgs/trunk/; revision=21836
 2010-05-18 12:36:23 +00:00
Yury G. Kudryashov 0e8261b0be eggdbus-0.6 
svn path=/nixpkgs/trunk/; revision=21785
 2010-05-15 09:55:08 +00:00
Andres Löh 5bf578f7f9 Updated cpphs version. 
svn path=/nixpkgs/trunk/; revision=21766
 2010-05-13 16:35:32 +00:00
Ludovic Courtès 32fcf8d32b Add GNU MIG. 
svn path=/nixpkgs/trunk/; revision=21750
 2010-05-12 15:46:43 +00:00
Marc Weber e97d2900d4 ctags: never use build dir as TMP 
svn path=/nixpkgs/trunk/; revision=21712
 2010-05-10 14:46:17 +00:00
Eelco Dolstra 82fe986554 * strace 4.5.20. 
svn path=/nixpkgs/trunk/; revision=21592
 2010-05-04 12:17:34 +00:00
Lluís Batlle i Rossell 6f2fac6466 Merging from trunk. 
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
 2010-04-22 21:44:33 +00:00
Lluís Batlle i Rossell f431b2ac38 Fixing a Marc's url that pointed to his local filesystem. 
There are still things to improve in that package (description?)
I'm trying to get hydra evaluate nixpkgs.

svn path=/nixpkgs/trunk/; revision=21163
 2010-04-19 12:27:18 +00:00
Lluís Batlle i Rossell 36623b8227 Updating openocd and libftdi (for the sheevaplug jtag) 
svn path=/nixpkgs/trunk/; revision=21139
 2010-04-17 10:15:47 +00:00
Marc Weber 6ce15d655f adding wvdial, wvstreams, usb_modeswitch 
svn path=/nixpkgs/trunk/; revision=21131
 2010-04-16 15:56:28 +00:00
Ludovic Courtès 9170abe84d GNU cppi 1.15. 
svn path=/nixpkgs/trunk/; revision=21052
 2010-04-13 08:56:11 +00:00
Ludovic Courtès 99d51d0e92 Assorted GNU updates. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=21047
 2010-04-13 08:37:54 +00:00
Yury G. Kudryashov f3ec0abdae Upgrade to gdb-7.1 
svn path=/nixpkgs/trunk/; revision=21010
 2010-04-11 14:49:36 +00:00
Ludovic Courtès 42ef635518 DejaGNU: Fix the default target found by `runtest'. 
svn path=/nixpkgs/trunk/; revision=20744
 2010-03-18 15:47:29 +00:00
Rob Vermaas 10637c8754 downgrade help2man 
svn path=/nixpkgs/trunk/; revision=20715
 2010-03-17 15:06:05 +00:00
Rob Vermaas ee149814c4 help2man 1.37.1 
svn path=/nixpkgs/trunk/; revision=20710
 2010-03-17 14:29:18 +00:00
Ludovic Courtès 2a24a1f3a4 Coccinelle: Fix test-suite runs. 
svn path=/nixpkgs/trunk/; revision=20608
 2010-03-13 18:19:31 +00:00
Ludovic Courtès 9dff94e2a0 Coccinelle 0.2.2. 
svn path=/nixpkgs/trunk/; revision=20600
 2010-03-12 18:44:47 +00:00
Ludovic Courtès 07356746ef Add GNU cppi. 
svn path=/nixpkgs/trunk/; revision=20363
 2010-03-04 11:10:44 +00:00
Lluís Batlle i Rossell fca769846a Adding a new special attribute for mkDerivation: crossAttrs. It sits next to 
"meta" and "passthru", and these attributes will be appended to the usual
mkDerivation attributes only if the package is cross built.
This allows putting some of the cross-building logic in the mkDerivation
nix parameters, and not only in the final builder script, as it was until now.

svn path=/nixpkgs/trunk/; revision=20272
 2010-02-27 17:35:42 +00:00
Lluís Batlle i Rossell 5ca75ac276 Updating gdb 
svn path=/nixpkgs/trunk/; revision=20271
 2010-02-27 13:00:55 +00:00
Lluís Batlle i Rossell ead553d9e5 Updating ddd, and adding a small patch for it to compile with gcc 4.4 
svn path=/nixpkgs/trunk/; revision=20161
 2010-02-22 08:08:29 +00:00
Marc Weber 82b66086dd make ctags find ruby modules 
svn path=/nixpkgs/trunk/; revision=20087
 2010-02-18 01:49:48 +00:00
Eelco Dolstra d8c6bb130c * Sync with the trunk one last time. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
 2010-02-05 23:06:36 +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 a617a7c239 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
 2010-02-03 14:23:43 +00:00
Ludovic Courtès 486ec4bddd Coccinelle 0.2.1. 
svn path=/nixpkgs/trunk/; revision=19736
 2010-01-30 17:34:49 +00:00
Lluís Batlle i Rossell bcba809460 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
 2010-01-25 18:52:07 +00:00
Ludovic Courtès 14ef547359 Add GNU Gengetopt. 
svn path=/nixpkgs/trunk/; revision=19618
 2010-01-22 17:00:44 +00:00
Peter Simons 28ef44c86a pkgs/development/tools/misc/distcc: patch distcc to use a 20 minute timeout for I/O 
After having established the connection to the distcc server, time out after 20
minutes of inactivity -- rather than 5 minutes, which is too quick to build
large C++ files with complex template machinery.

svn path=/nixpkgs/trunk/; revision=19600
 2010-01-21 15:40:48 +00:00
Peter Simons 05868b3046 pkgs/development/tools/misc/distcc: optionally, build static binaries without any dependencies 
Using nix-pkgs.conf, it is possible to disable avahi, python, and all other
optional dependencies of distcc in order to generate binaries that are as small
and simple as possible. Furthermore, there is now an option for static linking.

svn path=/nixpkgs/trunk/; revision=19599
 2010-01-21 15:40:43 +00:00
Eelco Dolstra 3407158873 * strace 4.5.19. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19561
 2010-01-20 10:55:30 +00:00
Eelco Dolstra d67f1d269e * binutils creates hard links to the programs in $out/bin in 
$out/<platform>/bin.  Because the fixup phase causes those to be
  replaced by identical copies, use symlinks instead of hardlinks.
  This saves about 9 MB.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19549
 2010-01-19 17:41:54 +00:00
Eelco Dolstra 4e65c8aa2a * Use patchelf 0.5. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19548
 2010-01-19 17:15:47 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
 2010-01-16 15:19:23 +00:00
Marc Weber 11f8b98ccc adding inotify-tools 
svn path=/nixpkgs/trunk/; revision=19469
 2010-01-15 19:35:02 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk. 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
 2010-01-14 14:49:31 +00:00
Ludovic Courtès f47d0d4011 Coccinelle 0.2.0. 
svn path=/nixpkgs/trunk/; revision=19384
 2010-01-13 08:51:22 +00:00
Ludovic Courtès 4220742818 Coccinelle 0.2.0rc1. 
svn path=/nixpkgs/trunk/; revision=19257
 2010-01-06 13:05:13 +00:00
Lluís Batlle i Rossell d864771e26 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
 2009-12-28 11:40:34 +00:00
Armijn Hemel b68ed67fc5 remove old expression 
svn path=/nixpkgs/trunk/; revision=19108
 2009-12-25 12:50:27 +00:00
Lluís Batlle i Rossell dae3eb2383 Merging from trunk. 
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
 2009-12-12 18:39:09 +00:00
Ludovic Courtès f63059dd05 Add Coccinelle, a semantic patch interpreter for C. 
svn path=/nixpkgs/trunk/; revision=18909
 2009-12-12 00:47:14 +00:00
Lluís Batlle i Rossell 9976583c97 As agreed with ludo, I remove the getConfig around the cscope expression, 
which deals only with a build time dependency. Let's better have hydra
build cscope (I set me as a maintainer), and prefer simpler expressions
to options on build-time dependencies.

svn path=/nixpkgs/trunk/; revision=18902
 2009-12-11 14:47:16 +00:00
Lluís Batlle i Rossell 2ccf2984eb Updating cscope, and making its dependency on emacs optional (and off by default), 
due to something called 'install emacs mode'.

svn path=/nixpkgs/trunk/; revision=18901
 2009-12-11 14:03:27 +00:00
Marc Weber 5319704f80 removing old bleeding edge cruft replacing it by a niftier version using 
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
 2009-12-11 13:58:23 +00:00
Ludovic Courtès 3b6cc2a5c2 Update Automake (CVE-2009-4029 security fix). 
svn path=/nixpkgs/trunk/; revision=18881
 2009-12-10 20:54:58 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
 2009-12-10 14:48:45 +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
Lluís Batlle i Rossell e1082c8ac6 Updating openocd from 0.2.0 to 0.3.1 
svn path=/nixpkgs/trunk/; revision=18843
 2009-12-08 19:31:04 +00:00
Ludovic Courtès c73d5761de binutils: Fix `as' patch. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18816
 2009-12-05 15:02:10 +00:00
Ludovic Courtès 9cb2e0aed7 binutils: Apply GNU assembler bug fix. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18815
 2009-12-05 14:28:17 +00:00
Lluís Batlle i Rossell 6c0b8d954a Adding gdbCross, to have a gdb for other targets than native. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18772
 2009-12-02 20:54:40 +00:00
Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory 
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
 2009-11-26 21:46:08 +00:00
Lluís Batlle i Rossell adc61253b9 Merging from trunk, partially, to get rid of the annoying failing commits from 
svn when files were removed, recreated and whatever...
 svn merge -r 18479:18485 ^/nixpkgs/trunk



svn path=/nixpkgs/branches/stdenv-updates/; revision=18659
 2009-11-26 21:34:53 +00:00
Ludovic Courtès f1f286052e Remove `unpackCmd's not needed with GNU tar format auto-detection (r18492). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18653
 2009-11-26 15:50:26 +00:00
Lluís Batlle i Rossell 585ba8c27f Big fixes in the cross build: 
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
 2009-11-22 19:51:45 +00:00
Ludovic Courtès 0d041d909b GNU Autoconf 2.65. 
svn path=/nixpkgs/trunk/; revision=18511
 2009-11-21 23:18:23 +00:00
Lluís Batlle i Rossell a5fee3325a Fixing some things on the gcc-cross-wrapper (libc was not properly added to the 
linking path), and with this achieved bash being cross-compilable.
I fixed the few expressions involved in bash building, so they have well stated
native and non-native inputs.

I also tried to cross-build guile, and with this I found a problem in the
actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This
way, the programs/shared_libraries don't get the proper -rpath.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18497
 2009-11-20 22:56:58 +00:00
Ludovic Courtès be4dfd41be GNU Libtool: Disable tests for now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18491
 2009-11-20 17:09:54 +00:00
Eelco Dolstra 973b9cfde6 * Remove some incorrect uses of makeOverridable. 
svn path=/nixpkgs/trunk/; revision=18483
 2009-11-20 12:51:14 +00:00