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

507 commits

Author SHA1 Message Date
Peter Simons 047f6d20d5 Updated CMake to version 2.6.3. 
svn path=/nixpkgs/trunk/; revision=15114
 2009-04-17 13:48:22 +00:00
Peter Simons 2796d3a185 Updated fixCmakeFiles to handle file paths that contain whitespace. 
svn path=/nixpkgs/trunk/; revision=15113
 2009-04-17 13:48:11 +00:00
Eelco Dolstra a4c304ef84 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
 2009-04-15 13:25:01 +00:00
Marc Weber 5951e31121 updating unifdef source location 
Why did the hash change as well?

svn path=/nixpkgs/trunk/; revision=15029
 2009-04-14 13:03:43 +00:00
Marc Weber 6d538fc6aa downgrade selenium-rc to rev 2450. The newer one is buggy (Neither allows using a FirefoxProfile nor launches Opera) 
svn path=/nixpkgs/trunk/; revision=15027
 2009-04-14 12:58:53 +00:00
Michael Raskin 3d5d738895 Added Gajim XMPP client in nearly full-feature configuration with all dependencies 
svn path=/nixpkgs/trunk/; revision=15001
 2009-04-12 19:34:20 +00:00
Eelco Dolstra 2eb05cf933 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
 2009-04-09 12:19:57 +00:00
Lluís Batlle i Rossell 8ddd79ca2e Making cdecl compile with readline. 
svn path=/nixpkgs/trunk/; revision=14941
 2009-04-08 10:09:14 +00:00
Armijn Hemel 349fea53b7 update to 1.3.39 
svn path=/nixpkgs/trunk/; revision=14890
 2009-04-05 19:47:23 +00:00
Eelco Dolstra e01be47e53 * aclocal wrapper: skip directories in ACLOCAL_PATH that don't exist, 
otherwise aclocal barfs.  Updated the builder to use makeWrapper
* Made Automake 1.10 the default.
* Fixed `make check' in Automake by turning off indented logging in
  Make (there is a flag for that now).
* Disabled the `make check' in Automake by default because it takes a
  REALLY long time (e.g. more than 2 hours on Cygwin, 50 minutes on
  Darwin, 25 minutes on Linux) which is a lot for a package that
  otherwise takes 10 seconds to build.  We can add a Hydra job with
  doCheck enabled to do regression testing.
* make-wrapper: allow --run commands to add additional flags to the
  invocation of the wrapped program.  An example is the aclocal
  wrapper: it adds additional -I ... flags.
* make-wrapper: call the wrapped program .foo-wrapped instead of
  .wrapped-foo to make it easier to tell programs apart in `ps'
  output.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14885
 2009-04-05 18:13:59 +00:00
Ludovic Courtès 4b663632ed GNU M4 1.4.13. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14834
 2009-04-02 12:33:27 +00:00
Eelco Dolstra d27514cb28 * Sync with the trunk once more. 
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
 2009-03-31 15:30:47 +00:00
Lluís Batlle i Rossell 9fde2b1a38 Binutils got in 2.18 GPLv3 
svn path=/nixpkgs/trunk/; revision=14796
 2009-03-30 22:13:42 +00:00
Lluís Batlle i Rossell 762d184399 Made oprofile not to build shared libs. This allows building on x86_64. 
svn path=/nixpkgs/trunk/; revision=14795
 2009-03-30 20:22:54 +00:00
Eelco Dolstra 9455f37ce9 * acl, attr: updated, and use libtool 2. 
* Removed libtoolOld.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14792
 2009-03-30 15:55:10 +00:00
Marc Weber 93f9b0f45e updating selenium to SNAPSHOT version 
to run firefox from selenium remote control you either have to use the
binary, write a binary wrapper or use latest version (which is what I've
done now)

svn path=/nixpkgs/trunk/; revision=14786
 2009-03-30 14:51:30 +00:00
Marc Weber 63dbfc3aa1 selenium remote control version bump to 1.0-beta-2 
renamed attr to seleniumRCBin and adding
selenium-remote-control-1.0-beta-2 run script

svn path=/nixpkgs/trunk/; revision=14734
 2009-03-27 09:39:19 +00:00
Lluís Batlle i Rossell 6b8acbd2dc Fixing the name of xxdiff. 
svn path=/nixpkgs/trunk/; revision=14692
 2009-03-24 19:24:14 +00:00
Eelco Dolstra d8e436c742 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
 2009-03-20 16:49:02 +00:00
Eelco Dolstra 5986a4d175 * More cleanup. Updated to the latest Stratego/XT 0.17. 
svn path=/nixpkgs/trunk/; revision=14610
 2009-03-19 14:34:16 +00:00
Peter Simons 22e1286711 Updated ANTLR version 2 from 2.7.6 to 2.7.7. 
svn path=/nixpkgs/trunk/; revision=14576
 2009-03-17 15:42:54 +00:00
Eelco Dolstra 3593b97d63 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
 2009-03-16 12:45:27 +00:00
Peter Simons 610aac30c3 Fixed Python StringTemplate library. 
Most importantly, this change required updating the ANTLR 2.x expression to
install the Python run-time library. While we're at it, we're building the
run-time library for C++ and Java, too. There is still work to be done: the
stringtemplate library doesn't find antlr.py without help yet.

svn path=/nixpkgs/trunk/; revision=14489
 2009-03-10 12:01:22 +00:00
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs 
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
 2009-03-06 23:21:28 +00:00
Marc Weber 51289a41b0 adjust packages to overridableDelayableArgs 
svn path=/nixpkgs/trunk/; revision=14427
 2009-03-06 23:21:24 +00:00
Ludovic Courtès a2317f6997 Doxygen 1.5.8. 
svn path=/nixpkgs/trunk/; revision=14350
 2009-03-05 15:17:53 +00:00
Eelco Dolstra fcad0b0a5a * Cleaned up a lot of description fields that contained newlines. 
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
 2009-03-03 13:27:40 +00:00
Eelco Dolstra 2c0558e11c * Valgrind 3.4.1. 
svn path=/nixpkgs/trunk/; revision=14304
 2009-03-03 09:19:50 +00:00
Ludovic Courtès 820ee6e61b G-Wrap 1.9.12. 
svn path=/nixpkgs/trunk/; revision=14248
 2009-02-25 16:57:41 +00:00
Peter Simons c8e6fa7dd6 cmake: added (low priority) expression for 2.6.3-rc-15. 
svn path=/nixpkgs/trunk/; revision=14124
 2009-02-19 14:41:51 +00:00
Eelco Dolstra 6d62e290a0 * elfutils: updated to 0.140. The older versions don't seem to be 
needed.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14105
 2009-02-17 16:42:51 +00:00
Ludovic Courtès f59b3d14dc Add SLOCCount, a tool to count source lines of code (SLOCs). 
svn path=/nixpkgs/trunk/; revision=14091
 2009-02-17 10:11:33 +00:00
Eelco Dolstra 62fa1a418f * cmake setup hook: override the whole configurePhase rather than 
setting a postUnpack hook.

svn path=/nixpkgs/trunk/; revision=14074
 2009-02-13 14:43:01 +00:00
Eelco Dolstra 390695e73f * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
 2009-02-12 21:16:55 +00:00
Michael Raskin 7590daad42 Extra mirror for lsof 
svn path=/nixpkgs/trunk/; revision=14036
 2009-02-11 21:51:05 +00:00
Eelco Dolstra efbfa0c395 * Latest lsof. 
svn path=/nixpkgs/trunk/; revision=14025
 2009-02-10 23:11:29 +00:00
Ludovic Courtès 6aa15fcfb0 GNU gperf 3.0.4. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13987
 2009-02-05 16:49:41 +00:00
Ludovic Courtès 8b87ac3eeb GNU Binutils 2.19.1. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13975
 2009-02-03 19:36:56 +00:00
Eelco Dolstra e8358099f5 * Doh. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13959
 2009-02-02 15:41:13 +00:00
Eelco Dolstra a68773a3ea * GNU m4: `make check' fails on Darwin: 
===
Checking ./219.improved_f
Checking ./stackovf.test
Stack soft limit set to 300K
Failure - m4 aborted unexpectedly
Output from m4:
m4: internal error detected; please report this bug to <bug-m4@gnu.org>: Bus error

Skipped checks were:
  ./116.changeword ./117.changeword ./118.changeword ./119.changeword ./120.changeword ./121.changeword
Failed checks were:
  ./stackovf.test
make[2]: *** [check] Error 1
make[1]: *** [check-recursive] Error 1
===

  So disable the check on Darwin for now.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13958
 2009-02-02 15:34:59 +00:00
Eelco Dolstra 15258b7f50 * Disable make check. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13937
 2009-02-01 21:21:21 +00:00
Eelco Dolstra c584bb878a * Sync with trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
 2009-01-29 16:33:02 +00:00
Nicolas Pierron 507ab31cbe Add ragel: A state machine compiler. 
svn path=/nixpkgs/trunk/; revision=13881
 2009-01-27 14:00:54 +00:00
Lluís Batlle i Rossell aad3e77b44 Adding cdecl-2.5 
svn path=/nixpkgs/trunk/; revision=13833
 2009-01-24 21:01:27 +00:00
Eelco Dolstra 808bf6d34a * Make the nested output patch in GNU Make runtime configurable (by 
setting the NIX_INDENT_MAKE variable; disabled by default) so we
  don't need a separate gnumakeNix package.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13807
 2009-01-19 18:49:58 +00:00
Eelco Dolstra c1579d2e78 * stdenv branch: synced with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
 2009-01-16 10:59:27 +00:00
Peter Simons 6fb297513a Committing Lluís Batlle's submissions from mailing list posting 
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
 2009-01-12 21:12:07 +00:00
Ludovic Courtès c18603c3b3 GDB: Use the system Readline library. 
svn path=/nixpkgs/trunk/; revision=13746
 2009-01-12 18:06:32 +00:00
Eelco Dolstra 7e9eb1bf70 * Valgrind 3.4.0. 
* callgrind_annotate.patch isn't needed because the generic builder
  rewrites /usr/bin/perl automatically.

svn path=/nixpkgs/trunk/; revision=13705
 2009-01-05 10:51:57 +00:00
Andres Löh c1ae54a6b3 version bump to 0.9.7 
svn path=/nixpkgs/trunk/; revision=13697
 2009-01-04 13:48:58 +00:00
Michael Raskin f87ad9b663 Autoconf 2.13 (older version used by Mozilla) 
svn path=/nixpkgs/trunk/; revision=13691
 2009-01-03 13:42:36 +00:00
Marc Weber 1b30419aa6 added yodl, dependency for zsh documentation 
svn path=/nixpkgs/trunk/; revision=13669
 2008-12-22 18:36:02 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead 
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
 2008-12-20 01:20:35 +00:00
Ludovic Courtès b942701506 GNU Bison 2.4.1. 
svn path=/nixpkgs/trunk/; revision=13619
 2008-12-12 12:37:29 +00:00
Eelco Dolstra 0cf7b1c811 * Latest strace. 
svn path=/nixpkgs/trunk/; revision=13607
 2008-12-10 17:09:11 +00:00
Eelco Dolstra e31341510d * Merged from the trunk. Let's see how well this works with 
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
 2008-12-10 09:59:21 +00:00
Ludovic Courtès 3918c63518 GNU Automake 1.10.2. 
svn path=/nixpkgs/trunk/; revision=13562
 2008-12-03 08:32:47 +00:00
Marc Weber fd3148dd5e new version icon-naming-utils-0.8.2 
svn path=/nixpkgs/trunk/; revision=13551
 2008-12-02 12:27:55 +00:00
Marc Weber 1a4a270855 bumped intltool to version 0.40.5 
svn path=/nixpkgs/trunk/; revision=13434
 2008-11-26 14:38:05 +00:00
Eelco Dolstra f7f25d81a7 * Oops. 
svn path=/nixpkgs/trunk/; revision=13301
 2008-11-14 17:27:54 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=13299
 2008-11-14 16:57:19 +00:00
Eelco Dolstra c1cbd437dc * Doh. 
svn path=/nixpkgs/trunk/; revision=13297
 2008-11-14 16:28:15 +00:00
Eelco Dolstra 704e51d3e2 * Reenable the check phase in Bison 2.4. 
* Use the passthru attribute.

svn path=/nixpkgs/trunk/; revision=13295
 2008-11-14 15:53:07 +00:00
Peter Simons 6a051f96a2 Updated cmake to version 2.6.2. 
svn path=/nixpkgs/trunk/; revision=13286
 2008-11-13 21:05:01 +00:00
Michael Raskin c5363217ad meta.function -> passthru.function, not killing other contents of passthru 
svn path=/nixpkgs/trunk/; revision=13190
 2008-11-04 21:24:10 +00:00
Michael Raskin 8b06e2e228 Try producing release without running bison2.4 testsuite.. 
svn path=/nixpkgs/trunk/; revision=13189
 2008-11-04 18:39:52 +00:00
Ludovic Courtès d7a1a64e57 GNU Bison 2.3: Fix `meta.license'. 
svn path=/nixpkgs/trunk/; revision=13182
 2008-11-03 18:28:13 +00:00
Ludovic Courtès c0960419b2 GNU Bison 2.3: Update `meta' attribute. 
svn path=/nixpkgs/trunk/; revision=13181
 2008-11-03 18:27:35 +00:00
Ludovic Courtès 8c1408bf27 GNU Bison 2.4 (2.3.x remains the default). 
svn path=/nixpkgs/trunk/; revision=13180
 2008-11-03 18:25:17 +00:00
Ludovic Courtès 6e9e3c0cc6 GNU Libtool 1.5.x: Add `meta' attribute. 
svn path=/nixpkgs/trunk/; revision=13178
 2008-11-03 10:23:33 +00:00
Ludovic Courtès fccfff91dd GNU Libtool 2.x: Add `meta' attribute. 
svn path=/nixpkgs/trunk/; revision=13177
 2008-11-03 10:22:41 +00:00
Ludovic Courtès e967438c48 Add GNU Libtool 2.2.x. 
svn path=/nixpkgs/trunk/; revision=13176
 2008-11-03 10:15:37 +00:00
Ludovic Courtès c4df2f80d5 GNU M4 1.4.12. 
Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13142
 2008-10-29 08:58:48 +00:00
Ludovic Courtès c0892721d0 GNU Binutils 2.19. 
Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13141
 2008-10-29 08:57:58 +00:00
Ludovic Courtès 79bcd85e81 GNU cflow: Fix reference to `cpp'. 
svn path=/nixpkgs/trunk/; revision=13132
 2008-10-28 10:25:10 +00:00
Ludovic Courtès 6921e41e84 Add GNU cflow. 
svn path=/nixpkgs/trunk/; revision=13129
 2008-10-28 08:43:44 +00:00
Peter Simons 574a1aa636 Added build expression for doxygen 1.5.7.1. 
svn path=/nixpkgs/trunk/; revision=13106
 2008-10-23 14:23:12 +00:00
Ludovic Courtès 8521b5c73f DejaGNU: Update comments, document chroot impurity. 
svn path=/nixpkgs/trunk/; revision=13088
 2008-10-16 20:54:32 +00:00
Ludovic Courtès 81542299cc DejaGNU: Disable test suite for now. 
svn path=/nixpkgs/trunk/; revision=13087
 2008-10-16 20:11:21 +00:00
Eelco Dolstra 5bc2dc536d * `pkg-config --cflags': ignore Requires.private (just like --libs). 
Whether this is correct is debatable (especially since there is no
  formal semantics for Requires.private), but not ignoring it breaks
  some packages (like Pango's dependency on Cairo).

svn path=/nixpkgs/branches/stdenv-updates/; revision=13060
 2008-10-14 12:06:36 +00:00
Eelco Dolstra 1e6622f4d5 * The patch for proper Requires.private processing is still necessary, 
unfortunately.  For instance, libxcb's xcb.pc declares:

    Requires.private: pthread-stubs ...

  Thus libxcb has to declare the pthread-stubs package as a
  propagatedBuildInput, otherwise packages that check for libxcb using
  pkg-config (such as libX11) will fail.  But then we get a totally
  unnecessary additional runtime dependency, which is clearly a bad
  thing.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13058
 2008-10-13 12:51:04 +00:00
Ludovic Courtès b43d4f87db Pkgconfig 0.23. 
Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13054
 2008-10-12 19:15:29 +00:00
Eelco Dolstra 5eef7df51d * intltool: deleted redundant copy (it's already in the Gnome Nix 
expressions).
* Fixed xkbcomp: it no longer found the keyboard definitions since it
  disregards the -R option passed by the X server (it chdirs to the -R
  path, but "." has been removed from the xkbcomp search path in
  xkbcomp 1.0.5).  Build it with /etc/X11/xkb as its default
  location.  This is less pure but it does allow for updating
  xkeyboard-config in a running server.
* xkeyboard-config: updated to 1.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13018
 2008-10-09 12:12:58 +00:00
Eelco Dolstra 0d62334693 * 1.4.11.nix -> default.nix. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=12997
 2008-10-08 08:47:20 +00:00
Eelco Dolstra 51aa939b21 * GNU M4 1.4.11. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=12993
 2008-10-07 17:34:00 +00:00
Eelco Dolstra bf65ff9ec6 * Use the texinfo-4.13a tarball. Strangely, the texinfo-4.13 tarball 
has a different hash on ftp.nluug.nl, which happens to be the first
  mirror for fetchurl, thus building texinfo failed.

svn path=/nixpkgs/trunk/; revision=12902
 2008-09-23 00:21:49 +00:00
Ludovic Courtès a4a186d4cf GNU Texinfo 4.13. 
svn path=/nixpkgs/trunk/; revision=12901
 2008-09-22 21:21:39 +00:00
Ludovic Courtès 88f0359c5c OProfile 0.9.4. 
svn path=/nixpkgs/trunk/; revision=12867
 2008-09-15 15:26:01 +00:00
Ludovic Courtès a8876e7130 GNU Autoconf 2.63. 
svn path=/nixpkgs/trunk/; revision=12840
 2008-09-11 12:45:20 +00:00
Ludovic Courtès 0a096340ad GDB 6.8. 
svn path=/nixpkgs/trunk/; revision=12792
 2008-09-03 13:12:23 +00:00
Peter Simons 85546a8e31 Updated scons and twisted; added buildbot. 
* Updated scons to version 1.0.0. Also added appropriate makeWrapper calls to
   ensure that the python binary finds its library files.

 * Updated Twisted from 2.5 to 8.1.

 * Added an expression for buildbot.

svn path=/nixpkgs/trunk/; revision=12782
 2008-09-01 15:11:09 +00:00
Pjotr Prins 73d2e4f49d - Some Ruby interpreter bumped version 
- Kernel headers 2.6.18 added (XEN virtual images)
- unifdef package added for kernel headers 2.6.18
- Python Zope and 4suite added
- Trying bioconductor packages with R-lang (still failing)
- Bumped gmp version
- Added rq cluster runner - still requires extra gems (installs, but does not run)


svn path=/nixpkgs/trunk/; revision=12766
 2008-08-29 13:53:28 +00:00
Eelco Dolstra b35469a42e * Nitpick. 
svn path=/nixpkgs/trunk/; revision=12747
 2008-08-27 15:21:10 +00:00
Ludovic Courtès 74d72ee6bf Cscope: Fix erroneous substitution that caused Cscope to depend on all 
of stdenv.

svn path=/nixpkgs/trunk/; revision=12714
 2008-08-25 19:34:14 +00:00
Ludovic Courtès 956a4e1ed2 Add Cscope, a C code browser. 
svn path=/nixpkgs/trunk/; revision=12711
 2008-08-25 15:34:14 +00:00
Ludovic Courtès 3328fd9d3d Add Sparse, a static analysis tool for C. 
svn path=/nixpkgs/trunk/; revision=12696
 2008-08-22 18:33:52 +00:00
Marc Weber c4270fb9b8 moved hasktags to ghc68executables, updated url to new location 
svn path=/nixpkgs/trunk/; revision=12680
 2008-08-21 11:07:44 +00:00
Eelco Dolstra 1acf5fa9f0 * Make Valgrind's default suppressions useful for Nix-compiled 
programs (e.g. a rule should match any libc.so, not just
  /lib/libc.so).

svn path=/nixpkgs/trunk/; revision=12661
 2008-08-19 13:03:08 +00:00
Michael Raskin 87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner. 
svn path=/nixpkgs/trunk/; revision=12655
 2008-08-19 05:54:09 +00:00
Marc Weber 9e55727832 Added: 
* dmenu
* gftp
* micropolis
* byacc as a build-time dependency for micropolis
contributed by baldo <baldo@quimby.lan>

svn path=/nixpkgs/trunk/; revision=12526
 2008-08-06 20:39:01 +00:00