Commit graph

433 commits

Author SHA1 Message Date
Mateusz Kowalczyk
a21d58515b ocaml-cairo: fix sha256
Seems that the original sha was just wrong but because Hydra doesn't
build this and we appear to have had no OCaml users until very recently,
no one noticed.
2014-09-23 06:23:14 +01:00
Florent Becker
8e4a1aebdd meta for ocamlPackages.eliom 2014-09-22 11:00:51 +02:00
Vincent Laporte
857c13e1af Minor modifications of some ocaml packages:
adds myself as a maintainer
adds assertions to have evaluation errors rather than build errors
moves opam out of ocamlPackages, as it does not provide a library
2014-09-21 11:02:55 +01:00
Mateusz Kowalczyk
1e5452865b Merge pull request #4061 from vbgl/mezzo
Adds mezzo and its dependencies
2014-09-20 23:38:47 +01:00
roconnor
bbd58db13a Merge pull request #4133 from vbgl/coq-8-3
Fixes coq-8.3: requires OCaml 3.12 and lablgtk 2.14
2014-09-20 16:24:10 -04:00
Vincent Laporte
40e79043b0 mkOcamlPackages: simpler rule for lablgtk 2014-09-20 18:53:43 +01:00
Vladimír Čunát
c1c8d561b1 fix evaluation (bogus licenses in ocaml-modules) 2014-09-20 10:34:47 +02:00
Domen Kožar
9cad5e755f Merge pull request #4170 from vbgl/ocaml-sexplib-camlp5
Updates ocaml-sexplib and ocaml-typeconv
2014-09-19 20:45:14 +02:00
Vincent Laporte
8febae5dfd Updates ocaml-sexplib and ocaml-typeconv
Fixes OCaml / camlp5 version mismatch
2014-09-19 19:09:37 +01:00
Eelco Dolstra
91ec6e0d90 Merge remote-tracking branch 'origin/master' into staging 2014-09-18 22:28:35 +02:00
Michael Raskin
a87e5507c0 More specific Ocsigen license checked by FlorentBecker 2014-09-18 14:42:54 +04:00
Vincent Laporte
d67588a5f1 Fixes coq-8.3: requires OCaml 3.12 2014-09-17 23:52:27 +01:00
Vincent Laporte
cc387fa886 Adds ocaml-functory
Functory is a distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion. Further, it is
polymorphic, incorporates a robust fault-tolerant mechanism and is already being deployed in real-world applications.

Homepage: https://www.lri.fr/~filliatr/functory/
2014-09-13 12:26:07 +02:00
Vincent Laporte
ed72590004 Adds ocaml-pprint
Pprint is an OCaml adaptation of Wadler’s and Leijen’s prettier printer.

Homepage: http://gallium.inria.fr/~fpottier/pprint/
2014-09-13 12:26:07 +02:00
Vincent Laporte
2f0994010a Adds ocaml-fix
Fix is a simple OCaml module for computing the least solution of a system of monotone equations.

Homepage: http://gallium.inria.fr/~fpottier/fix/
2014-09-13 12:26:07 +02:00
Vladimír Čunát
82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
Vladimír Čunát
1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Aristid Breitkreuz
8f30cabb83 fix ocsigen expression 2014-09-06 12:45:20 +02:00
Michael Raskin
9a9ecbf32d A description cleanup after merge 2014-09-06 12:44:33 +04:00
Florent Becker
2709d32274 Add a derivation for eliom (ocaml web framework) 2014-09-06 12:44:33 +04:00
Florent Becker
e8250dd94a Add a derivation for the ocsigen server (ocaml webserver) 2014-09-06 12:44:33 +04:00
Florent Becker
da6859722d Add tyxml (XML library for ocaml) 2014-09-06 12:44:33 +04:00
Florent Becker
b5c621062d add ocaml-ipaddr 2014-09-06 12:44:32 +04:00
Florent Becker
ffe02360dc Add a derivation for deriving (ocaml instance derivation à la Haskell) 2014-09-06 12:44:32 +04:00
Florent Becker
6863dfeccc Add a derivation for ocaml-optcomp 2014-09-06 12:44:32 +04:00
Florent Becker
2ca3c23ddc Add a derivation for ocaml-calendar 2014-09-06 12:44:32 +04:00
Michael Raskin
316a4981b3 Merge pull request #3920 from vbgl/javalib-fix
ocaml-javalib, ocaml-sawja: removes wrong path to bash in configure scripts
2014-09-04 21:05:03 +04:00
Vincent Laporte
ebbd54e9f0 ocaml-javalib, ocaml-sawja: uses patchShebangs rather than ad-hoc patches 2014-09-03 21:59:29 +02:00
Vincent Laporte
b33b05a878 ocaml-twt: some fixes 2014-09-03 12:07:33 +02:00
Vincent Laporte
7d3706c788 Merge remote-tracking branch 'upstream/master' into ocaml-sqlite3EZ
Conflicts:
	pkgs/top-level/all-packages.nix
2014-09-02 13:32:43 +02:00
Michael Raskin
f927e860f2 Merge pull request #3849 from vbgl/cmdliner
Adds ocaml-cmdliner
2014-09-02 02:14:19 +04:00
Michael Raskin
4e3ee27060 Merge pull request #3681 from vbgl/merlin-1.7
Merlin: update to 1.7
2014-09-02 02:07:27 +04:00
vbgl
624e98e78e ocaml-javalib, ocaml-sawja: removes wrong path to bash in
configure scripts
2014-09-01 12:04:43 +02:00
Florent Becker
328469aa06 add the ocaml 'lambda-term' library (terminal control) 2014-08-30 19:37:15 +04:00
Florent Becker
edc11bc4f9 add the 'zed' ocaml editor library 2014-08-30 19:37:15 +04:00
Florent Becker
892490726c Use propagated inputs in lwt 2014-08-30 19:37:15 +04:00
Florent Becker
7e2766d646 Update ocaml_lwt to version 2.4.5 (from git) 2014-08-30 19:37:15 +04:00
Florent Becker
337a3b8212 Update ocaml-react to 1.1.0 2014-08-30 19:37:15 +04:00
Florent Becker
618f439d2e Add a derivation for ocaml-text 2014-08-30 19:37:15 +04:00
Vincent Laporte
23b9029455 Adds ocaml-cmdliner
Cmdliner is an OCaml module for the declarative definition of command
line interfaces.

Homepage: http://erratique.ch/software/cmdliner
2014-08-29 11:46:39 +02:00
Michael Raskin
2f0b2be1f2 Merge pull request #3632 from vbgl/ocaml-csv
Adds ocaml library “csv”
2014-08-23 13:04:52 +04:00
Vincent Laporte
f439cc7cf6 Adds javalib and sawja
Javalib is a library that parses Java .class files into OCaml data
structures. Sawja is a library written in OCaml, relying on Javalib to
provide a high level representation of Java bytecode programs.

Homepage: http://sawja.inria.fr/
2014-08-23 12:44:16 +04:00
Michael Raskin
d459b587e4 Merge pull request #3299 from vbgl/erratique-uu
Adds OCaml libraries: uucd, uunf, uutf and xmlm
2014-08-23 12:25:55 +04:00
Vincent Laporte
b8826951e4 Adds ocaml-sqlite3EZ and its dependency ocaml+twt
ocaml+twt is an alternative syntax for OCaml that uses indentation to group
multi-line expressions, like Python and Haskell.

Homepage: http://people.csail.mit.edu/mikelin/ocaml+twt/

sqlite3EZ is a thin wrapper for sqlite3-ocaml with a simplified interface. Query
results are processed with a functional map/fold, transactions are
aborted by exceptions, resource management is handled by the garbage
collector, etc.

Homepage: https://github.com/mlin/ocaml-sqlite3EZ
2014-08-21 15:36:52 +02:00
Vincent Laporte
559c7cc2da yojson: propagate build inputs (as in PR #3404) 2014-08-19 18:41:16 +02:00
Vincent Laporte
bce3730a3c Adds ocaml library “csv”
This is a pure OCaml library to read and write CSV files, including all
extensions used by Excel — eg. quotes, newlines, 8 bit
characters in fields, "0 etc.

Homepage: https://forge.ocamlcore.org/projects/csv/
2014-08-17 00:55:32 +02:00
Vladimír Čunát
141b5d961f Merge master into PR
Conflicts:
	pkgs/development/compilers/ocaml/4.01.0.nix
2014-08-12 21:52:20 +02:00
Eelco Dolstra
e3f7dbbac8 Cleanup: Use += to append to envHooks 2014-08-09 12:47:05 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Florent Becker
d1bbd569c9 Update ocaml-pcre to version 7.1.1 2014-07-21 10:56:51 +02:00
Vincent Laporte
64c6d0117d Adds OCaml libraries: uucd, uunf, uutf and xmlm
Four OCaml libraries contributed by Daniel Bünzli for unicode and xml
processing.

 -  xmlm: Streaming XML codec for OCaml
 -  uutf: Non-blocking streaming Unicode codec for OCaml
 -  uunf: Unicode text normalization for OCaml
 -  uucd: Unicode character database decoder for Ocaml

Homepage: http://erratique.ch/software
2014-07-16 10:05:53 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Vincent Laporte
9256136635 Adds yojson.
Yojson is an optimized parsing and printing OCaml library for the JSON
format, contributed by Martin Jambon.

Webpage: http://mjambon.com/yojson.html
2014-07-05 09:00:12 +02:00
Vincent Laporte
e4216eddda Clarifies the license; populates meta.platforms 2014-07-03 15:23:38 +02:00
Vincent Laporte
543f355883 Adds biniou 2014-07-03 11:09:47 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Vincent Laporte
b598497da9 Adds easy-format 2014-06-29 15:37:46 +02:00
Vladimír Čunát
35f47bcfd8 fix evaluation (wrong meta.maintainers field) 2014-06-09 19:12:17 +02:00
Pascal Wittmann
86b7cf8bb4 Added llpp, a mupdf based pdf pager written in ocaml.
Updated lablgl to 1.05 and mupdf to 1.4.
Added myself as maintainer for lablgl.
2014-06-04 22:15:06 +02:00
Austin Seipp
4fe2f98051 zarith: fix perl path
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 09:14:16 -05:00
Austin Seipp
5f702d52f4 ocamlgraph: upgrade to 1.8.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:30:39 -05:00
Austin Seipp
02351691ba ocaml-packages: add zarith 1.2.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:30:28 -05:00
Austin Seipp
2d7fe68212 lablgtk: remove old patch
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 02:25:45 -05:00
Oliver Charles
f7de4f099f Merge pull request #2347 from vbmithr/ocaml-pcre
Updated OCaml package pcre
2014-04-25 10:31:18 +01:00
Vincent Bernardoff
b0a6bb414d Updated react to 1.0.1 2014-04-23 17:02:46 +02:00
Vincent Bernardoff
123ef8a57b Updated OCaml package pcre 2014-04-22 00:31:27 +02:00
Marco Maggesi
42b070527c Update ocamlnet to version 3.7.3
Also remove dependency to lablgkt which is not used and prevent
building on darwin.
2014-03-20 14:54:54 +01:00
Shea Levy
80ed0ff85f Merge branch 'ocaml-oasis' of git://github.com/maggesi/nixpkgs
Ocaml oasis
2014-03-15 13:14:14 -04:00
Marco Maggesi
210a9db16f Update OCaml ExtLib to version 1.6.1 2014-01-31 13:59:44 +01:00
Marco Maggesi
e1df6c2162 Update OCaml react to version 2.4.3 2014-01-31 12:01:32 +01:00
Marco Maggesi
f3a49abf08 Add OCaml Oasis
OCaml Oasis is a configure/build/install system for OCaml proget (like
Cabal for Haskell).

This commit also add a few small dependencies that where missing

  -  OCaml Data Notation (odn)
  -  ocamlify
  -  ocamlmod
2014-01-31 12:01:32 +01:00
Marco Maggesi
ec1b40be87 Update OCaml Batteries to version 2.2.0 2014-01-31 12:01:32 +01:00
Marco Maggesi
841a02cabb Update OCaml Type_conv to version 109.60.01.
Also keep the old version 3.0.5 around for compatibility with OCaml 3.12.1.
2014-01-31 12:01:31 +01:00
Eelco Dolstra
e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Marco Maggesi
e634e4ae6b Update OCaml library Camomile to version 0.8.5 2014-01-18 20:56:45 +00:00
Marco Maggesi
c54a9276ba Update menhir to version 20130115 2014-01-18 20:56:44 +00:00
Marco Maggesi
cd2fd2a401 Update cryptokit to version 1.9 2014-01-18 20:56:44 +00:00
Marco Maggesi
663845fc9e Update OCaml OUnit to version 2.0.0 2014-01-18 20:56:44 +00:00
David Cadé
9bda7275ce added OCaml package ocamlsdl 2013-12-05 16:20:32 +01:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Evgeny Egorochkin
5d56681505 extlib: fix version to match tarball 2013-07-14 02:08:51 +03:00
Mathijs Kwik
0b17251c06 libpng: keep versioning in all-packages.nix, not in individual expressions 2013-06-27 21:35:21 +02:00
Mathijs Kwik
7f413e4d5c whitespace cleaning 2013-06-27 21:35:21 +02:00
Christophe Raffalli
101aad1467 camlimages ... still wasn't ok. Now better. 2013-06-19 04:39:55 +02:00
Christophe Raffalli
ce2efd0b5b fixed dependencies of camlimages 2013-06-16 22:33:44 +02:00
Christophe Raffalli
27bf590d3c upgraded ocaml-mysql to 1.1.1 2013-06-16 22:33:38 +02:00
Christophe Raffalli
fc36c19834 Added OCaml gmp bindings mlgmp 2013-06-16 22:33:33 +02:00
Christophe Raffalli
270d929089 New ocaml packages:
- ocaml-cairo
- camlimages
- dypgen
- patoline
2013-06-07 21:40:38 +02:00
Christophe Raffalli
43faad8063 Upgraded ocamlnet to 3.6.3. Also enabled mot functionality of ocamlnet like nethttp 2013-06-07 21:40:38 +02:00
Christophe Raffalli
5765e186d2 upgraded ocaml/sqlite3 to 2.0.4 2013-06-07 21:40:37 +02:00
Christophe Raffalli
b3fa714f1f upgraded lablgtk to version 2.16 to allow compilation with ocaml-4.00.1 2013-06-07 21:40:37 +02:00
Christophe Raffalli
59877bd1ad upgraded camlzip to version 1.05 to allow compilation with ocaml-4.00.1 2013-06-07 21:40:37 +02:00
Christophe Raffalli
af7fd67e43 upgraded ocaml/cryptokit to 1.7 2013-06-07 21:40:37 +02:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Marco Maggesi
a090424115 Update ocamlnet to version 3.6. (Does not compile under 4.00.0 though.) 2012-10-09 14:03:12 -04:00
Marco Maggesi
3989f09ae6 Update ounit to version 1.1.2 2012-10-09 14:03:11 -04:00
Marco Maggesi
c3e12acb5a Update extlib to version 1.5.2 2012-10-09 14:03:11 -04:00
Arie Middelkoop
26b4e2a286 compatibility fix of ocaml-extlib for ocaml 4.00.0. 2012-07-31 14:10:11 +02:00
Arie Middelkoop
2d09dbf8fc update of ocaml-makefile to version 6.37.0. 2012-07-31 14:09:49 +02:00
Arie Middelkoop
63be0ae2f7 patch of sexplib for compatibility with ocaml 4.00.0. 2012-07-31 14:09:40 +02:00
Arie Middelkoop
7d70836580 ocamlgraph: update to 1.8.2
Also added the dependency on lablgtk, so that it builds the 'dgraph' module,
which is needed for packaging frama-c. This dependency can be made optional.
2012-07-31 14:08:48 +02:00
Marco Maggesi
6cf6d40534 Update OCaml sqlite3
svn path=/nixpkgs/trunk/; revision=34312
2012-06-01 09:42:29 +00:00
Marco Maggesi
de6b7ac64e Update download link for pcre-ocaml
svn path=/nixpkgs/trunk/; revision=34311
2012-06-01 06:08:29 +00:00
Marco Maggesi
7fda94a082 Upstream hash change
svn path=/nixpkgs/trunk/; revision=34310
2012-05-31 21:26:12 +00:00
Marco Maggesi
0ff3dd24ad Fix hash change of ocaml-pcre sources
svn path=/nixpkgs/trunk/; revision=34260
2012-05-28 14:14:35 +00:00
Arie Middelkoop
2b18ccf305 * Added "easytag", a GUI for organizing id3tags in mp3s.
* Updated some ocaml packages.
* Updated coccinelle.

svn path=/nixpkgs/trunk/; revision=33674
2012-04-09 09:42:20 +00:00
Russell O'Connor
4bccef4db2 Updating hash for ocaml_sqlite3
Markus Mottl <markus.mottl@gmail.com> said by email to me that 

``Note that this link is served by a Mercurial Apache module, i.e. this
is not static content.  It's likely that e.g. tar or bzip2 produce
slightly different output, which would explain changing hashes.

So I guess we shouldn't worry too much about the change in hash?


svn path=/nixpkgs/trunk/; revision=33419
2012-03-25 21:24:23 +00:00
Arie Middelkoop
3a7b035380 Fix of the ocaml extlib expression. The native object files were not installed. Turns out that also the 'opt' make target must be run besides 'all'.
svn path=/nixpkgs/trunk/; revision=33350
2012-03-22 10:32:32 +00:00
Arie Middelkoop
31ffda057e Fix of the ocaml pcre nix expr. Added 'pcre' as propagated build input.
svn path=/nixpkgs/trunk/; revision=33349
2012-03-22 10:31:10 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Arie Middelkoop
d9f5e277a5 OCamlMakefile update.
svn path=/nixpkgs/trunk/; revision=32687
2012-02-29 12:51:06 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Arie Middelkoop
c87285c255 Updated the coccinelle package to the latest release (1.0.0-RC9).
Added additional ocaml modules which are needed for coccinelle.

svn path=/nixpkgs/trunk/; revision=31579
2012-01-16 10:20:13 +00:00
Arie Middelkoop
3b833cc93b Minor-version bump of ocaml-batteries.
The previous version did not compile with ocaml>=3.12, and this version is also backwards compatible with 3.11.

svn path=/nixpkgs/trunk/; revision=31578
2012-01-16 10:17:02 +00:00
Marco Maggesi
b41da3c8df Add ocamlnat (native toplevel for OCaml)
svn path=/nixpkgs/trunk/; revision=30926
2011-12-16 09:35:13 +00:00
Marco Maggesi
ef32f76d6e Update OUnit to version 1.1.0
svn path=/nixpkgs/trunk/; revision=30924
2011-12-16 09:13:47 +00:00
Karn Kallio
9ac48a630e Add OPA to Nixpkgs.
svn path=/nixpkgs/trunk/; revision=30578
2011-11-27 23:58:46 +00:00
Russell O'Connor
845f2a8658 adding camlp5 as a propogated build input to ulex 0.8
matita and ulex must build against the same version of camlp5, so in an attempt to force them to always be the same I am adding a propgatedBuildInput to ulex.
Granted Matita still requires camlp5_traditional and this is less obvious in the matita file now, so I am not entirely sure this is the right design choice.

svn path=/nixpkgs/trunk/; revision=30552
2011-11-24 19:43:03 +00:00
Marco Maggesi
af9eaf3441 Oops
svn path=/nixpkgs/trunk/; revision=27901
2011-07-22 07:39:14 +00:00
Marco Maggesi
b1f6ed4a6e Update OCaml Batteries to 1.4.0
svn path=/nixpkgs/trunk/; revision=27900
2011-07-22 07:28:51 +00:00
Marco Maggesi
e2b159dabe ocaml batteries: https --> http
svn path=/nixpkgs/trunk/; revision=27303
2011-05-25 09:27:50 +00:00
Marco Maggesi
e8466deeff ocaml batteries: fix download url
svn path=/nixpkgs/trunk/; revision=27300
2011-05-24 20:40:55 +00:00
Marco Maggesi
5b730d301c Update ocaml_batteries and camomile (ocamlPackages)
*  Add camomile 0.8.3 and 0.8.2 (for ocaml_batteries).
  *  Remove obsolete camomile 0.7.3 and 0.8.1.
  *  Update ocaml_batteries to version 1.3.0 (also add fixes for Darwin).


svn path=/nixpkgs/trunk/; revision=27299
2011-05-24 18:21:13 +00:00
Russell O'Connor
88ec92d14c Matita and its dependencies.
svn path=/nixpkgs/trunk/; revision=25328
2010-12-31 17:48:55 +00:00
Marco Maggesi
5e13810a01 * Remove useless code put by error in camomile
svn path=/nixpkgs/trunk/; revision=25221
2010-12-21 09:43:13 +00:00
Marco Maggesi
eb33e01ac7 * Add variable createFindlibDestdir to the setupHook of findlib
* Set createFindlibDestdir to various ocaml packages.

svn path=/nixpkgs/trunk/; revision=25220
2010-12-21 09:37:35 +00:00
Marco Maggesi
f3eb5769ca * Add ocamlnet
svn path=/nixpkgs/trunk/; revision=25072
2010-12-12 17:53:13 +00:00
Marco Maggesi
eaf8b73517 * Fix installation of camlzip
svn path=/nixpkgs/trunk/; revision=25071
2010-12-12 17:45:57 +00:00
Marco Maggesi
0b701b824b * take camlzip META file from GODI
svn path=/nixpkgs/trunk/; revision=25069
2010-12-12 16:09:52 +00:00
Marco Maggesi
ba8bc4dd33 * Add ocaml-sqlite3
svn path=/nixpkgs/trunk/; revision=25065
2010-12-11 15:05:26 +00:00
Marco Maggesi
e1bbcecbaf * Enable hydra build for ocaml-batteries, camlzip, camomile, ocaml-cryptgps, cryptokit, ocaml-lwt, menhir, ounit, ocaml-pcre, ocaml-react, ocaml-ssl
svn path=/nixpkgs/trunk/; revision=25064
2010-12-11 14:50:45 +00:00
Marco Maggesi
ac457478e3 * Add ocaml packages findlib, camlzip, ocaml-ssl, ocaml-batteries, menhir, camomile, ocaml-lwt, cryptokit, ocaml-cryptgps, ounit, ocaml-react
svn path=/nixpkgs/trunk/; revision=25041
2010-12-09 15:40:04 +00:00