BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9023 commits 1 branch 0 tags 3.8 GiB
Commit graph

8840 commits

Author SHA1 Message Date
Michael Raskin
1497cacb6e adding libxcursor dependency 
svn path=/nixpkgs/trunk/; revision=18930
 2009-12-14 00:14:55 +00:00
Michael Raskin
43a41f3d1d adding libxcursor dependency 
svn path=/nixpkgs/trunk/; revision=18929
 2009-12-14 00:14:43 +00:00
Michael Raskin
0909bc107c changes for Content 
svn path=/nixpkgs/trunk/; revision=18928
 2009-12-14 00:00:34 +00:00
Michael Raskin
a996d01af9 Adding content. Unfortunately, currently segfaults 
svn path=/nixpkgs/trunk/; revision=18927
 2009-12-14 00:00:11 +00:00
Ludovic Courtès
bc05fb3160 PulseAudio: Add maintainer and platform. 
svn path=/nixpkgs/trunk/; revision=18926
 2009-12-13 21:14:45 +00:00
Michael Raskin
8f31565c68 All-packages entry for NCBI C toolbox 
svn path=/nixpkgs/trunk/; revision=18925
 2009-12-13 20:24:23 +00:00
Michael Raskin
c0a4109daa Adding NCBI C language toolbox 
svn path=/nixpkgs/trunk/; revision=18924
 2009-12-13 20:22:13 +00:00
Ludovic Courtès
c7991b8a2b PulseAudio 0.9.21. 
svn path=/nixpkgs/trunk/; revision=18923
 2009-12-13 20:19:19 +00:00
Ludovic Courtès
f4e365b3a0 GNU libgcrypt 1.4.5. 
svn path=/nixpkgs/trunk/; revision=18922
 2009-12-13 20:19:14 +00:00
Ludovic Courtès
1bf9e1eadc GNU libsigsegv 2.8. 
svn path=/nixpkgs/trunk/; revision=18921
 2009-12-13 20:19:08 +00:00
Ludovic Courtès
c685880825 libsndfile 1.0.21. 
svn path=/nixpkgs/trunk/; revision=18920
 2009-12-13 20:19:03 +00:00
Lluís Batlle i Rossell
193f70d887 Updating the ld-wrapper about linking of direct .so files. The previous 
regexp looking for such ld arguments did not work well with "--soname=xxx.so".
Now I added the condition that the argument should not start with a hyphen, for
it to be possibly considered a .so file to link with.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18919
 2009-12-13 16:18:53 +00:00
Peter Simons
24c117f98d pkgs/applications/version-management/git-and-tools/git: updated to version 1.6.5.6 
svn path=/nixpkgs/trunk/; revision=18917
 2009-12-13 13:47:10 +00:00
Lluís Batlle i Rossell
5cbd244265 Updating ntp. 
svn path=/nixpkgs/trunk/; revision=18916
 2009-12-12 19:48:12 +00:00
Lluís Batlle i Rossell
a534f901bb Updating hugin. 
svn path=/nixpkgs/trunk/; revision=18915
 2009-12-12 18:58:40 +00:00
Eelco Dolstra
71ed6194e1 * Get fbcondecor to work. 
* Barf on ignored options.

svn path=/nixpkgs/branches/kernel-config/; revision=18914
 2009-12-12 18:55:17 +00:00
Lluís Batlle i Rossell
6bacb66dd3 Updating the gcc-wrapper with the changes done in trunk's gcc-wrapper2. 
Removing any reference to the gcc-wrapper2, as now the gcc-wrapper already conveys
the changes, I created gcc-wrapper2 in trunk for.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18913
 2009-12-12 18:48:07 +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
Marc Weber
362f811a7a Revert "git: allow applying patches by config" 
This reverts commit rev 18897
I should have used overrideDerivation.

svn path=/nixpkgs/trunk/; revision=18911
 2009-12-12 18:10:26 +00:00
Eelco Dolstra
03e45e0cb4 * Added a script to generate the kernel configuration. 
`generate-config.pl' runs `make config' to generate a Linux kernel
  configuration file.  For each question (i.e. kernel configuration
  option), unless an override is provided, it answers "m" if possible,
  and otherwise uses the default answer (as determined by the default
  config for the architecture).  This is safer than allmodconfig,
  which answers "y" everywhere it can't answer "m" and thus ends up
  enabling a lot of experimental or debug options.  (For this reason,
  a configuration generated by allmodconfig must be carefully checked
  with every new release to ensure that nothing dangerous is enabled.
  The default config should be safer wrt new kernel releases.)

  Overrides are specified in the `config' argument to generic.nix,
  which is a string that contains lines such as `EXT2_FS_POSIX_ACL y'.
  The script warns about ignored options, and aborts if `make config'
  selects an answer inconsistent with the one in `config'.  This
  allows us to be sure that `make config' doesn't silently override
  our configuration values (e.g., depending on other options, it will
  set FB_TILEBLITTING to "y" even if we want it to be "n").

svn path=/nixpkgs/branches/kernel-config/; revision=18910
 2009-12-12 13:51:07 +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
Marc Weber
f62924477e fix hash of libCSS (netsurf browser) 
svn path=/nixpkgs/trunk/; revision=18908
 2009-12-12 00:20:29 +00:00
Ludovic Courtès
b4ae0db5a5 guile: Improve `disable-gc-sensitive-tests.patch'. 
svn path=/nixpkgs/trunk/; revision=18907
 2009-12-11 21:48:14 +00:00
Ludovic Courtès
ef0cd29eb0 GNU Coreutils 8.2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18906
 2009-12-11 20:05:54 +00:00
Marco Maggesi
98aaa4421c Add expression for Isabelle2009 
svn path=/nixpkgs/trunk/; revision=18905
 2009-12-11 17:00:52 +00:00
Marco Maggesi
218bdaf214 Add expression for ProofGeneral 
svn path=/nixpkgs/trunk/; revision=18904
 2009-12-11 16:18:27 +00:00
Lluís Batlle i Rossell
f7fb372440 Adding a patch to cdrkit, for it to work with cmake 2.8. 
I don't know how it could build ever with older cmake versions, because IMO
they lacked the patch I'm adding.

svn path=/nixpkgs/trunk/; revision=18903
 2009-12-11 15:36:24 +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
833832dc92 commenting older ghc's they can't be compiled due to realdine and 
linking issues. I'm not willing to fix them right now.

svn path=/nixpkgs/trunk/; revision=18900
 2009-12-11 13:58:41 +00:00
Marc Weber
f9ecf5a44f fix build of ghc-6.8.2 
svn path=/nixpkgs/trunk/; revision=18899
 2009-12-11 13:58:36 +00:00
Marc Weber
fdd2d5cb2a remove nixRepositoryManager. It can be installed using the haskell-nix-overlay 
svn path=/nixpkgs/trunk/; revision=18898
 2009-12-11 13:58:34 +00:00
Marc Weber
0ceae8f6d1 git: allow applying patches by config 
svn path=/nixpkgs/trunk/; revision=18897
 2009-12-11 13:58:31 +00:00
Marc Weber
78a1418e6d ghcs: provide list of core packages. Required by solver of thE haskell-nix-overlay 
svn path=/nixpkgs/trunk/; revision=18896
 2009-12-11 13:58:29 +00:00
Marc Weber
5d6b65d339 fix perl-5.8 build 
svn path=/nixpkgs/trunk/; revision=18895
 2009-12-11 13:58:26 +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
Marc Weber
1030a6bb68 fix mjpegtools 
svn path=/nixpkgs/trunk/; revision=18893
 2009-12-11 13:58:17 +00:00
Marc Weber
f2ec65a538 fix source-and-tags 
svn path=/nixpkgs/trunk/; revision=18892
 2009-12-11 13:58:15 +00:00
Marc Weber
e102a7173e haskellPackages: add comment about hack-nix 
svn path=/nixpkgs/trunk/; revision=18891
 2009-12-11 13:58:05 +00:00
Lluís Batlle i Rossell
2dd9764a9e Major update to cmake, from 2.6.4 to 2.8.0. 
I tried some kde4 builds, and the worked.

svn path=/nixpkgs/trunk/; revision=18890
 2009-12-11 07:58:54 +00:00
Lluís Batlle i Rossell
f5c5c0b4b6 Updating vtk; simplifying the openal cmake build expression. 
svn path=/nixpkgs/trunk/; revision=18888
 2009-12-11 07:16:16 +00:00
Lluís Batlle i Rossell
f3c23487a2 Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild 
stdenv.

In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared
objects through direct pass as ld command arguments of the absolute path to shared
objects, instead of using the -L/-l combinations.

cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly
passing the absolute path to the shared object to the linker, and as our wrapper did
not add any -rpath for those, writting the nix expressions for some cmake packages
resulted in a lot of tricks, compared to using this gcc-wrapper2.

This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a
stdenv update.

I also updated some cmake expressions to use this gcc-wrapper2, and reduced its
tricks.

I also updated the cmake setup-hook for it to make cmake not touch any rpath decided
at build time, when running the 'make install' of makefiles created by cmake.

svn path=/nixpkgs/trunk/; revision=18885
 2009-12-10 22:19:52 +00:00
Ludovic Courtès
164eb9c699 Typo. 
svn path=/nixpkgs/trunk/; revision=18883
 2009-12-10 21:39:02 +00:00
Ludovic Courtès
19d02b6ca4 ocaml: Add description. 
svn path=/nixpkgs/trunk/; revision=18882
 2009-12-10 21:27:19 +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
61a6bdad88 Reverting some changes I brought in by error for util-linux-ng (I was trying 
their git version, to check some bugfixes they did for my reports).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18880
 2009-12-10 15:05:26 +00:00
Lluís Batlle i Rossell
99f8d729b0 Updating nix's aterm from aterm242fixes to aterm25 (proposed by niksnut). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18879
 2009-12-10 14:50:50 +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
Marco Maggesi
adbaa14548 Add expression for PolyML 
svn path=/nixpkgs/trunk/; revision=18875
 2009-12-10 13:16:06 +00:00
Lluís Batlle i Rossell
16eabd95b3 Updating the libstdc++ man pages to 4.4.0. We have gcc-4.3.4 in trunk, but I don't think it will be any annoyance. 
svn path=/nixpkgs/trunk/; revision=18871
 2009-12-10 08:12:49 +00:00
Michael Raskin
3871c1ebd2 Update xboard 
svn path=/nixpkgs/trunk/; revision=18870
 2009-12-10 06:55:12 +00:00
Eelco Dolstra
b2c9e50203 * Added Fedora 12. This requires the latest RPM, because the RPMs are 
compressed with xz.

svn path=/nixpkgs/trunk/; revision=18868
 2009-12-09 22:35:46 +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
Eelco Dolstra
06b135ebf8 svn path=/nixpkgs/trunk/; revision=18865 2009-12-09 21:41:19 +00:00
Peter Simons
d21a4d14fc pkgs/servers/x11/xorg/overrides.nix: dropped override for libXaw on Darwin 
With the latest version of libXaw, those patches aren't necessary
anymore; the build has been fixed upstream.

svn path=/nixpkgs/trunk/; revision=18856
 2009-12-09 15:56:20 +00:00
Peter Simons
abebc10cf1 pkgs/development/compilers/swi-prolog/default.nix: updated to version 5.6.64 and enabled GUI support 
svn path=/nixpkgs/trunk/; revision=18853
 2009-12-09 14:07:09 +00:00
Lluís Batlle i Rossell
60788973d0 Adding a required option to uclibc for util-linux-ng (the git master version, 
not that of nixpkgs, which still has bugs) to link well with uclibc.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18852
 2009-12-09 13:33:23 +00:00
Michael Raskin
13b91e2ca8 Update CouchDB; add Apache-related snippets to update-upstream-data. 
svn path=/nixpkgs/trunk/; revision=18851
 2009-12-09 12:59:23 +00:00
Lluís Batlle i Rossell
48bb7745e7 gcc 4.4.2 is also affected by the wrong CPP passed to the configure script of 
the target libraries, as 4.3.4
I trigger the breaking build using uclibc, instead of glibc, and then the
mixture of CPP getting the build glibc headers, and CC getting the uclibc
headers, makes the problem evident.
In 4.3.4 it only affected libmudflap. In 4.4.2, it affects libmudflap and
libstdc++.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18850
 2009-12-09 10:05:47 +00:00
Marc Weber
7ef915ebc8 nixpkgs lib: adding haskell's take 
svn path=/nixpkgs/trunk/; revision=18848
 2009-12-08 21:47:14 +00:00
Peter Simons
89b59e3fbc applications/version-management/git-and-tools/git: update to version 1.6.5.5 
svn path=/nixpkgs/trunk/; revision=18847
 2009-12-08 20:35:51 +00:00
Lluís Batlle i Rossell
916896e252 I took away the patch about the -Bxxx not being passed to target libraries 
through libtool.
I found a make variable holding flags that will not be trimmed by libtool:
FLAGS_FOR_TARGET.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18846
 2009-12-08 19:46:32 +00:00
Lluís Batlle i Rossell
21b2bc74b2 The bison elf may call m4 (I saw that building binutils' gold). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18845
 2009-12-08 19:42:18 +00:00
Lluís Batlle i Rossell
60a5f44759 Updating the url for the latest armv5tel linux bootstrap-tools. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18844
 2009-12-08 19:34:25 +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
Eelco Dolstra
ab708d5b6e * xfsprogs updated to 3.0.3. 
* xfsprogs: don't use shared libraries because libxfs.so isn't
  installed for some reason, so mkfs.xfs doesn't work.

svn path=/nixpkgs/trunk/; revision=18842
 2009-12-08 16:58:22 +00:00
Eelco Dolstra
87fcfb0df2 * davfs2 updated to 1.4.5. 
* neon updated to 0.28.6.

svn path=/nixpkgs/trunk/; revision=18841
 2009-12-08 13:08:27 +00:00
Eelco Dolstra
83ee756b0a * Latest FUSE and sshfs. 
svn path=/nixpkgs/trunk/; revision=18839
 2009-12-08 11:38:34 +00:00
Eelco Dolstra
ebeacec489 * Linux 2.6.27.39. 
svn path=/nixpkgs/trunk/; revision=18838
 2009-12-08 11:38:19 +00:00
Lluís Batlle i Rossell
7cae967c7c Removing the coreutils-7.5, which were needed in armv5tel in contrast to 
coreutils 7.6, which did not build well. The newer coreutils 8.1 work perfectly,
and we don't need to rely in older versions.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18836
 2009-12-08 10:04:43 +00:00
Lluís Batlle i Rossell
a2b2e6542f New bootstrap-tools for armv5tel, with binutils and gcc-4.4. Without these binutils, 
we can't build easily with them gcc-4.4 natively, because of a bug in the ld of the
previous bootstrap-tools.
I updated the unpack script to include the new gcc-4.4 libraries *ppl*.so in patchelfing.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18835
 2009-12-08 10:03:20 +00:00
Lluís Batlle i Rossell
d0ae140f69 Renamed some old glibcCross to libcCross (we can use uclibc in cross builds already). 
Dealt with the gcc 4.4 expression for it to work well for a native and a cross
compiler, adding a pair of patches to get the job done without much side
effects. One (libtool problems on -B) comes from the gcc 4.3 expression, while
the other fixes a bug already fixed in gcc 4.4.3.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18833
 2009-12-08 09:36:19 +00:00
Rob Vermaas
86fa4600dc aspectj front for strategoxt 0.18 
svn path=/nixpkgs/trunk/; revision=18831
 2009-12-07 14:57:10 +00:00
Rob Vermaas
d2c7ef9524 svn path=/nixpkgs/trunk/; revision=18830 2009-12-07 14:56:48 +00:00
Rob Vermaas
da0863d21f build stratego-shell for darwin 
svn path=/nixpkgs/trunk/; revision=18829
 2009-12-07 14:26:24 +00:00
Rob Vermaas
506c2f37c0 strategoshell based on strategoxt 0.18 
svn path=/nixpkgs/trunk/; revision=18828
 2009-12-07 14:19:23 +00:00
Michael Raskin
fb82f5c79f Update cl-ppcre.. 
svn path=/nixpkgs/trunk/; revision=18822
 2009-12-05 22:20:05 +00:00
Ludovic Courtès
5d7de35976 Qtpfsgui 1.9.3. 
svn path=/nixpkgs/trunk/; revision=18818
 2009-12-05 15:43:07 +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
917760a425 Adding the patch for gcc-4.3 I should have commited in already two recent commit attempts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18814
 2009-12-04 21:35:47 +00:00
Lluís Batlle i Rossell
9651069240 Adding a gcc patch I forgot to add in the proper commit, while it is already 
referenced in the gcc 4.3 expression.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18813
 2009-12-04 18:42:44 +00:00
Eelco Dolstra
589ba9982d * Added s3backer. 
svn path=/nixpkgs/trunk/; revision=18811
 2009-12-04 15:51:02 +00:00
Eelco Dolstra
20845cabfc * Remove an unused file. 
svn path=/nixpkgs/trunk/; revision=18810
 2009-12-04 15:42:27 +00:00
Eelco Dolstra
c726012afe * Refactoring: move most filesystem utilities / FUSE filesystems to 
tools/filesystems.  Previously they were all over the place.

svn path=/nixpkgs/trunk/; revision=18809
 2009-12-04 15:39:49 +00:00
Ludovic Courtès
064aae6461 releaseTools.sourceTarball: Allow overriding of the bootstrap build inputs. 
svn path=/nixpkgs/trunk/; revision=18804
 2009-12-04 14:56:37 +00:00
Lluís Batlle i Rossell
4164de326a Making the cross-builds work with uclibc. There is no easy way of switching 
between uclibc/glibc still.
I started the renaming from glibc to libc regarding the cross-toolchain, but I
still have to finish.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18801
 2009-12-04 13:35:58 +00:00
Lluís Batlle i Rossell
e9abf7bb0c Updating util-linux-ng 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18800
 2009-12-04 13:34:18 +00:00
Marco Maggesi
ec6f4788bb Fixed download url for Unison File Syncronizer. 
svn path=/nixpkgs/trunk/; revision=18793
 2009-12-03 16:40:18 +00:00
Eelco Dolstra
bf7a38f3ff * X.org server 1.7.3. 
svn path=/nixpkgs/trunk/; revision=18792
 2009-12-03 15:51:40 +00:00
Ludovic Courtès
69421194a5 nix-prefetch-svn: Support $NIX_PREFETCH_SVN_LEAVE_DOT_SVN. 
svn path=/nixpkgs/trunk/; revision=18789
 2009-12-03 15:01:54 +00:00
Eelco Dolstra
135cfab57e * PHP 5.2.11. 
svn path=/nixpkgs/trunk/; revision=18786
 2009-12-03 14:33:40 +00:00
Michael Raskin
84eb2eadef Apply patch from Lluis needed for future ARM merge.. 
svn path=/nixpkgs/trunk/; revision=18776
 2009-12-03 07:08:51 +00:00
Rob Vermaas
af84eef331 some more x86_64 darwin changes 
svn path=/nixpkgs/trunk/; revision=18774
 2009-12-02 22:19:49 +00:00
Rob Vermaas
0b20c5c38f merged x86_64 changes back to trunk 
svn path=/nixpkgs/trunk/; revision=18773
 2009-12-02 21:03:02 +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
6fadcfbd03 Building coreutils with gmp, only because it is possible to do so. 
I don't know the advantage, though.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18770
 2009-12-02 19:34:34 +00:00
Sander van der Burg
307280e9e3 Reverted guest additions back to 3.0.10 since 3.1.0 has a new installer. I will look at this installer later 
svn path=/nixpkgs/trunk/; revision=18760
 2009-12-02 13:45:42 +00:00
Sander van der Burg
8681d7d695 Upgraded VirtualBox to version 3.1.0 
svn path=/nixpkgs/trunk/; revision=18758
 2009-12-02 13:31:56 +00:00
Andres Löh
30468489ca Added httpd-shed. 
svn path=/nixpkgs/trunk/; revision=18756
 2009-12-02 12:48:34 +00:00