Commit Graph

326 Commits

Author SHA1 Message Date
Tobias Geerinckx-Rice
13749c5e92 geolite-legacy 2015-04-16 -> 2015-04-21 2015-04-21 01:48:28 +02:00
Tobias Geerinckx-Rice
4679104133 tzdata 2015a -> 2015c 2015-04-17 00:46:20 +02:00
Tobias Geerinckx-Rice
13f6f9046d geolite-legacy: 2015-03-26 -> 2015-04-16
Clean up: use a helper function to fetch database files.
2015-04-16 05:44:23 +02:00
Tobias Geerinckx-Rice
1a77b59a85 Add geolite-legacy 2015-03-26
The geoip package only installs a GeoIP _library_ which is useless
without a GeoIP _database_.

The only package to currently install such a database is ntopng, which
manually downloads Maxmind's GeoLite Legacy files to a private location.

Provide these as a separate package so other packages can use them as
well.
2015-03-31 16:36:15 +02:00
Christian Theune
6daa2462c6 Enable syncthing for Mac OS X.
Also requires enabling iana-etc. I'm shooting for "unix" platforms which
seems reasonable. Not sure why this was restricted to linux originally --
the history doesn't tell.
2015-03-30 22:07:02 +02:00
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Vladimír Čunát
51a8a43dfc Merge #6472: add ddccontrol 2015-03-16 21:52:59 +01:00
Vladimír Čunát
f41f7a0bb9 ddccontrol*: cleanup
- remove doubled file for ddccontrol-db
- adding stdenv to buildInputs is pointless
- fix doubled http://
- whitespace, etc.
2015-03-16 21:47:06 +01:00
Fedor Pakhomov
eb8105ad01 Separated DDCcontrol-DB declaration from DDCcontrol declaration 2015-03-07 01:10:46 +03:00
Thomas Tuegel
07d0dd3be0 Merge branch 'kde5' 2015-02-25 15:09:44 -06:00
Thomas Tuegel
ad06db5ddc media-player-info: patch extra shebangs to fix chroot build 2015-02-25 12:07:37 -06:00
Eelco Dolstra
586b9d9525 tzdata: Update to 2015a 2015-02-25 15:24:53 +01:00
Thomas Tuegel
95b13b1155 add media-player-info 2015-02-21 11:39:19 -06:00
Eelco Dolstra
52b743add4 tzdata: Update to 2014j 2014-11-25 00:42:22 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Domen Kožar
6f9a111186 tzdata: set platforms to build on hydra 2014-10-27 18:41:42 +01:00
Vladimír Čunát
e76772d1fd tzdata: update 2014-10-25 21:37:24 +02:00
Aristid Breitkreuz
8303601d2c poppler_data: update from 0.4.6 to 0.4.7 2014-10-07 23:22:09 +02:00
Mateusz Kowalczyk
5409201b64 Revert "Revert "tzdata: bump to 2014g.""
This reverts commit 0b4c22edaa.

This should now work according to #4243
2014-09-24 20:50:34 +01:00
Domen Kožar
0b4c22edaa Revert "tzdata: bump to 2014g."
This reverts commit 4dce30e510.

Breaks all go packages.
2014-09-19 20:40:54 +02:00
Eelco Dolstra
ee082af1e0 Merge pull request #4151 from lostdj/ltp/master/tzdata2014g
tzdata: bump to 2014g
2014-09-18 18:37:37 +02:00
lostdj
4dce30e510 tzdata: bump to 2014g. 2014-09-18 20:21:26 +04:00
Nixpkgs Monitor
73bd403a57 shared_mime_info: update from 1.2 to 1.3 2014-09-06 19:02:27 +02:00
Pascal Wittmann
4cf191a425 miscfiles: update from 1.4.2 to 1.5 and adopt it 2014-09-01 23:59:07 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Eelco Dolstra
6b67028383 cacert: Update to 20140715
This is generated with a more recent version of mk-ca-bundle.pl. The
previous version mistakenly dropped some certificates, like "Verisign
Class 3 Public Primary Certification Authority".
2014-08-05 10:43:25 +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
Eelco Dolstra
b9c457ba12 cacert: Update to 20140704 2014-07-30 10:14:40 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Eelco Dolstra
0a11e40596 tzdata: Update to 2014e 2014-07-08 18:35:40 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Mihaly Barasz
1f2228cdc1 tzdata: use symlinks instead of hardlinks
Hard links are not handled by nar, so installing from binary cache
unnecessarily duplicates data. Also, it's more common to use symlinks for the
tzdata package in other distributions.
2014-04-29 16:25:10 +02:00
Eelco Dolstra
dc224baba1 tzdata: Update to 2014b 2014-04-29 16:13:15 +02:00
Mihaly Barasz
c2c90bf2bb tzdata: fix 'posix' symlink 2014-04-29 16:08:19 +02:00
aszlig
46e90f76c6
tzdata: Provide lib as an additional output.
We're already using tzcode inside tzdata, so let's make it available as
an output here. The reason we need it is in order to compile OpenCFLite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:44 +01:00
Vladimír Čunát
546bd7738d xorg xkeyboard-config: update, unify with the other expression 2014-01-30 13:46:02 +01:00
Bjørn Forsman
4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Eelco Dolstra
3f799e7233 cacert: Update to 20131205 2013-12-20 18:29:06 +01:00
Nixpkgs Monitor
8298e450a7 shared_mime_info: update from 1.1 to 1.2 2013-12-04 06:53:44 +02:00
Eelco Dolstra
0c0bc0857e tzdata: Update to 2013g 2013-10-15 17:24:33 +02:00
Eelco Dolstra
50b2e52988 hicolor-icon-theme: Move to data/icons 2013-08-15 16:53:40 +02:00
Evgeny Egorochkin
c7fbb70af0 shared-desktop-ontologies: version bump to 0.11.0 2013-07-12 16:36:12 +03:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Evgeny Egorochkin
fb906e44ac shared-mime-info: update to 1.1 2013-05-25 12:01:26 +03:00
Rob Vermaas
d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman
05bb66ce20 Add myself as maintainer for several packages
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Bjørn Forsman
ab7d500f36 freepats: new package
freepats is a project to create a free and open set of instrument
patches, in any format, that can be used with softsynths.

I'm adding it because it is needed for WildMIDI, which is needed for
MIDI support in Qmmp (audio player). I'll add WildMIDI and Qmmp in the
next commit(s).
2013-05-19 14:09:36 +02:00
Eelco Dolstra
d5c8f4cb60 cacert: Update to 20121229 2013-05-15 13:15:53 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
bf4313cd88 update gsettings-desktop-schemas and make system-wide
Conflicts:
	pkgs/data/misc/gsettings-desktop-schemas/default.nix
	pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
2013-02-21 20:42:39 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Vladimír Čunát
319b6f77ca minor poppler-data update 2013-01-29 14:07:30 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01: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
Eelco Dolstra
9f9a561107 xkeyboard-config; Update to 2.7 2012-09-26 15:51:57 -04:00
Eelco Dolstra
d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Eelco Dolstra
167df7ad32 Add tzdata
Glibc 2.16 no longer contains timezone data (yay!) so provide tzdata
instead.
2012-09-18 14:00:18 -04:00
Yury G. Kudryashov
497c364f7c SDO-0.10.0 2012-08-26 22:23:17 +04:00
Eelco Dolstra
acdd81fb9c Add some packages to the channel 2012-08-17 09:53:55 -04:00
Rickard Nilsson
2faada9f30 mobile-broadband-provider-info: Update to 20120614 2012-07-31 15:16:11 +02:00
Shea Levy
c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
Eelco Dolstra
ebc1c7d6c7 cacert: Update to 20120628 2012-07-05 17:31:23 -04:00
Eelco Dolstra
1a4d1facda * xkeyboard-config updated to 2.5.1.
svn path=/nixpkgs/branches/x-updates/; revision=34127
2012-05-15 21:30:03 +00:00
Yury G. Kudryashov
9b6f100fa0 shared-mime-info-1.0
svn path=/nixpkgs/trunk/; revision=33505
2012-03-31 21:29:12 +00:00
Yury G. Kudryashov
793d0c983c Move gsettings-desktop-schemas to data/misc
svn path=/nixpkgs/trunk/; revision=32929
2012-03-08 22:45:58 +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
Yury G. Kudryashov
5fe8b64cea SDO: add meta.homepage
svn path=/nixpkgs/trunk/; revision=31566
2012-01-14 18:04:34 +00:00
Yury G. Kudryashov
c22e6aadc5 Add mobile-broadband-provider-info
svn path=/nixpkgs/trunk/; revision=31328
2012-01-05 23:25:28 +00:00
Yury G. Kudryashov
05f5c8802e shared-desktop-ontologies-0.8.1
See
http://trueg.wordpress.com/2011/11/25/the-different-places-something-can-go-wrong/

svn path=/nixpkgs/trunk/; revision=30918
2011-12-15 20:16:46 +00:00
Michael Raskin
bfa4a2d374 Allow cross-builds
svn path=/nixpkgs/trunk/; revision=30708
2011-12-03 09:07:56 +00:00
Shea Levy
5143705396 Get Theme-GNU directly from spock while kernel.org is down
svn path=/nixpkgs/trunk/; revision=29537
2011-09-28 22:34:46 +00:00
Yury G. Kudryashov
63959f2a5a Let poppler use ${POPPLER_DATADIR}
Also upgrade poppler-data

svn path=/nixpkgs/trunk/; revision=29342
2011-09-19 08:35:30 +00:00
Eelco Dolstra
f887ecef57 * Latest CA certificate bundle, now without DigiNotar certificate.
svn path=/nixpkgs/trunk/; revision=29269
2011-09-14 11:59:18 +00:00
Yury G. Kudryashov
0a2debdee3 SDO-0.8.0
svn path=/nixpkgs/trunk/; revision=28911
2011-08-29 22:48:36 +00:00
Eelco Dolstra
353ec7a128 * CAcert bundle updated to the latest version (it was almost two years old).
svn path=/nixpkgs/trunk/; revision=28856
2011-08-28 16:02:18 +00:00
Eelco Dolstra
7582e841e2 * Update xkeyboard-config to 2.1. (The latest version, 2.3, requires
a newer version of libX11 than we have.)

svn path=/nixpkgs/branches/kde-4.7/; revision=27870
2011-07-21 12:14:20 +00:00
Eelco Dolstra
76ec0dd430 * Update a bunch of dependencies of kdelibs.
svn path=/nixpkgs/branches/kde-4.7/; revision=27702
2011-07-11 10:49:21 +00:00
Yury G. Kudryashov
a288b1b216 shared-mime-info-0.90
svn path=/nixpkgs/trunk/; revision=27370
2011-06-07 21:48:53 +00:00
Michael Raskin
28d5c8d5b5 Some improvements to intl-rich layout
svn path=/nixpkgs/trunk/; revision=25171
2010-12-17 12:19:34 +00:00
Yury G. Kudryashov
d8d6ffefb6 Switch to kde-4.5 by default
svn path=/nixpkgs/trunk/; revision=24192
2010-10-10 07:39:01 +00:00
Yury G. Kudryashov
325a0370a7 poppler-data-0.4.3
svn path=/nixpkgs/trunk/; revision=24025
2010-10-02 05:24:33 +00:00
Eelco Dolstra
4ae72f5ab2 * Added pkgs/data/misc/hicolor-icon-theme, required by Xfce.
svn path=/nixpkgs/trunk/; revision=23060
2010-08-09 18:00:08 +00:00
Eelco Dolstra
8e168422fb * xkeyboard-config updated to 1.9.
svn path=/nixpkgs/branches/x-updates/; revision=22633
2010-07-18 21:51:33 +00:00
Yury G. Kudryashov
d0de407886 SDO-0.5
svn path=/nixpkgs/trunk/; revision=22621
2010-07-17 22:11:59 +00:00
Yury G. Kudryashov
98cfefe7ea Upgrade shared-mime-info
svn path=/nixpkgs/trunk/; revision=20928
2010-04-02 15:25:21 +00:00
Michael Raskin
58e5881b9b More symbols for symbol-rich layout
svn path=/nixpkgs/trunk/; revision=20324
2010-03-02 13:19:58 +00:00
Lluís Batlle i Rossell
9501307305 Updating the url for shared desktop ontologies.
svn path=/nixpkgs/trunk/; revision=19943
2010-02-11 22:22:00 +00:00
Sander van der Burg
31cbd149d2 - Completed all dependencies for kdelibs-4.4.0
- Added SIP 4.10 required for pyqt-4.7.x
- Removed kde libs experimental, which does not exists anymore in 4.4.0


svn path=/nixpkgs/trunk/; revision=19910
2010-02-10 16:01:55 +00:00
Eelco Dolstra
f724089f6f * Added a bundle of CA certificates, useful for e.g. curl.
svn path=/nixpkgs/trunk/; revision=19571
2010-01-20 14:10:26 +00:00
Lluís Batlle i Rossell
0c4c01f6c9 Adding bsdgames and miscfiles (this later, for 'words')
I could not easily make some bsdgames build or install. Too much patching
against the installer trying to write beyond the nix store.

svn path=/nixpkgs/trunk/; revision=17971
2009-10-26 23:03:36 +00:00
Lluís Batlle i Rossell
1c5056a7d7 Updating the xkeyboard_config patch for esperanto with alt_gr
svn path=/nixpkgs/trunk/; revision=15848
2009-06-03 21:21:10 +00:00
Eelco Dolstra
58b4add4e6 * Updated the IANA /etc info.
svn path=/nixpkgs/trunk/; revision=15763
2009-05-28 12:42:41 +00:00
Michael Raskin
01548fb7b9 xkeyboard-config update to 1.5
svn path=/nixpkgs/trunk/; revision=15448
2009-05-05 09:55:20 +00:00
Michael Raskin
bc2257232b Update Theme-GNU location to something more reliable
svn path=/nixpkgs/trunk/; revision=15425
2009-05-03 03:52:49 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Michael Raskin
24f5e84ebb LE/GE symbols
svn path=/nixpkgs/trunk/; revision=15164
2009-04-19 21:46:07 +00:00
Ludovic Courtès
8a13ebda3a shared-mime-info: Add dependency on Perl (for Intltool).
svn path=/nixpkgs/branches/stdenv-updates/; revision=14665
2009-03-23 20:31:12 +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
Michael Raskin
1e385684e2 gr layout contained polytonic symbols not mentioned in keysymdefs.h
svn path=/nixpkgs/trunk/; revision=14597
2009-03-19 06:18:26 +00:00
Michael Raskin
441f2de840 Testing showed that these keys do not work well in non-us layout..
svn path=/nixpkgs/trunk/; revision=14583
2009-03-18 05:42:53 +00:00
Michael Raskin
2345d0c8aa hyphen, nbsp, plusminus for rich kb layout
svn path=/nixpkgs/trunk/; revision=14575
2009-03-17 15:11:18 +00:00
Michael Raskin
dbab1ae680 Added arrows into rich international layout
svn path=/nixpkgs/trunk/; revision=14567
2009-03-17 05:12:03 +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
Ludovic Courtès
5e508b5753 Poppler data 0.2.1.
svn path=/nixpkgs/trunk/; revision=14154
2009-02-21 20:35:55 +00:00
Eelco Dolstra
1b849c8282 * Latest shared-mime-info.
* Latest Catalyst runtime.

svn path=/nixpkgs/trunk/; revision=14086
2009-02-16 14:57:35 +00:00
Eelco Dolstra
48eb3bd187 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14073
2009-02-13 13:49:29 +00:00
Michael Raskin
6ed4d1fe5a emdash/endash for very rich keyboard layout..
svn path=/nixpkgs/trunk/; revision=14071
2009-02-13 13:30:11 +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
Michael Raskin
fe07ca76d0 Added GNU console theme from CD
svn path=/nixpkgs/trunk/; revision=13729
2009-01-08 23:48:59 +00:00
Michael Raskin
5c21897316 Copied Green theme declaration from NixOS source here
svn path=/nixpkgs/trunk/; revision=13725
2009-01-08 22:21:32 +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
Ludovic Courtès
ee9998e303 Poppler data 0.2.0.
svn path=/nixpkgs/trunk/; revision=12376
2008-07-18 07:45:48 +00:00
Yury G. Kudryashov
bcb28f63a0 shared-mime-info: 0.23 added
svn path=/nixpkgs/branches/stdenv-updates/; revision=10738
2008-02-18 20:50:49 +00:00
Yury G. Kudryashov
9f91384819 Added nc6, updated xkeyboard-config
svn path=/nixpkgs/branches/stdenv-updates/; revision=10574
2008-02-10 17:35:57 +00:00
Yury G. Kudryashov
a7703662a4 Merged with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
2008-01-15 00:55:21 +00:00
Yury G. Kudryashov
6203fa41f7 Added poppler and poppler-data
svn path=/nixpkgs/trunk/; revision=9633
2007-11-11 16:00:51 +00:00
Yury G. Kudryashov
ad5847f250 shared-mime-info: URL corrected & upgrade to 0.22
svn path=/nixpkgs/trunk/; revision=9348
2007-09-20 19:18:55 +00:00
Yury G. Kudryashov
67d41efde1 Added some parts of kde-4. It doesn't work yet, but I need version control
svn path=/nixpkgs/trunk/; revision=9049
2007-08-05 13:54:42 +00:00
Michael Raskin
9787a92b8f Removed a link that gets in the way sometimes and leads nowhere anyway.
svn path=/nixpkgs/trunk/; revision=9030
2007-08-02 21:28:26 +00:00
Eelco Dolstra
e3d318da8b * The X server still calls itself "xfree86" wrt the xkb rules.
svn path=/nixpkgs/trunk/; revision=8495
2007-03-29 22:59:30 +00:00
Eelco Dolstra
11ad14113c * Added xkeyboard-config, the keyboard configuration database.
svn path=/nixpkgs/trunk/; revision=8490
2007-03-29 21:02:22 +00:00
Eelco Dolstra
951da2409f * Slightly cleaner way.
svn path=/nixpkgs/trunk/; revision=7289
2006-12-09 00:57:16 +00:00
Eelco Dolstra
8695d51417 * Added the IANA protocols and services files for /etc.
svn path=/nixpkgs/trunk/; revision=7288
2006-12-09 00:54:11 +00:00