Shea Levy
bb469d5e25
xorgserver: Update dir path patch
2012-07-14 15:03:36 -04:00
Shea Levy
71e0a3fb93
x.org: Update to 7.7
2012-07-14 14:33:58 -04:00
Eelco Dolstra
932d5bee54
* X.org 7.7 RC1. Note that xorg-server doesn't build yet.
...
svn path=/nixpkgs/branches/x-updates/; revision=34147
2012-05-16 22:06:27 +00:00
Lluís Batlle i Rossell
6a838a4ba1
Making x11perf build.
...
svn path=/nixpkgs/trunk/; revision=33651
2012-04-06 18:33:51 +00:00
Lluís Batlle i Rossell
b24bab3873
Getting a much newer version of the openchrome X driver
...
svn path=/nixpkgs/trunk/; revision=33405
2012-03-25 13:53:07 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Arie Middelkoop
b4d5957ac4
Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon.
...
svn path=/nixpkgs/trunk/; revision=32035
2012-02-05 00:43:54 +00:00
Yury G. Kudryashov
5b132f6e96
svn merge ^/nixpkgs/trunk
...
Conflicts: cups, all-packages.nix (gcc45_debug)
svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Peter Simons
8045c6ebe2
dri-proto: upgraded to version 2.6 so that we can use intel 2.17 driver
...
svn path=/nixpkgs/trunk/; revision=31773
2012-01-21 18:47:40 +00:00
Yury G. Kudryashov
84c0185038
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Peter Simons
5ebdf058cc
intel X driver: upgraded to fix display glitches on newer chips
...
at least 2 nixos users were affected by a graphics bug that got fixed
in 2.15.
Officially 2.15 was meant for a newer xorg server, libdrm, mesa and all, but
I've been running with this for over a month with no issues (used
compositing desktop, opengl and hd video).
I know 2.17 is in the repo, but it doesn't builde (missing deps I
think).
svn path=/nixpkgs/trunk/; revision=31661
2012-01-18 20:38:30 +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
Peter Simons
fedda96bee
xf86-video-ati: updated to version 6.14.3
...
svn path=/nixpkgs/trunk/; revision=31471
2012-01-10 20:12:25 +00:00
Florian Friesdorf
2e31e7293a
moved parts of extra.list back to tarballs-7.6.list
...
also added an short description about them to generate-expr-from-tarballs.pl
svn path=/nixpkgs/trunk/; revision=31189
2011-12-31 15:37:51 +00:00
Florian Friesdorf
d2e8c37e41
default.nix now fully generated again
...
with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.
svn path=/nixpkgs/trunk/; revision=31185
2011-12-31 06:07:37 +00:00
Florian Friesdorf
1745900396
add xf86-video-intel-2.14.901 (and while at it 2.17.0) to extra.list
...
svn path=/nixpkgs/trunk/; revision=31184
2011-12-31 06:07:34 +00:00
Florian Friesdorf
2a2ceace7f
generate-expr-from-tarballs.pl support multiple versions
...
svn path=/nixpkgs/trunk/; revision=31183
2011-12-31 06:07:32 +00:00
Florian Friesdorf
f6090f6bba
reproduced my previous manual changes through generation of default.nix
...
svn path=/nixpkgs/trunk/; revision=31182
2011-12-31 06:07:28 +00:00
Florian Friesdorf
cebb40f533
adjusted oder of *.list in generate-expr-from-tarballs.pl example
...
svn path=/nixpkgs/trunk/; revision=31181
2011-12-31 06:07:26 +00:00
Florian Friesdorf
e45921800c
adjusted example generate-expr-from-tarballs.pl call to 7.6
...
svn path=/nixpkgs/trunk/; revision=31180
2011-12-31 06:07:23 +00:00
Florian Friesdorf
0bb20084b5
xorg: alphabetical extra.list
...
svn path=/nixpkgs/trunk/; revision=31179
2011-12-31 06:07:21 +00:00
Florian Friesdorf
c9b2b8a182
xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list
...
svn path=/nixpkgs/trunk/; revision=31178
2011-12-31 06:07:18 +00:00
Florian Friesdorf
e1556e64d7
xorg: moved individuals from tarballs-7.6 to extra.list and regen tarballs-7.6
...
svn path=/nixpkgs/trunk/; revision=31177
2011-12-31 06:07:15 +00:00
Florian Friesdorf
44ef26c896
xlsclients-1.1.2
...
svn path=/nixpkgs/trunk/; revision=31176
2011-12-31 04:30:46 +00:00
Florian Friesdorf
251d42d03f
xcb-util-0.3.8 (+image|keysyms|renderutil|wm)
...
this might break things but makes awesome-3.4.11 happy
svn path=/nixpkgs/trunk/; revision=31171
2011-12-31 04:05:50 +00:00
Alexander Tsamutali
0ed57e3f64
servers/x11/xorg/overrides.nix:
...
Added xproto to propagatedBuildInputs of libXext, because for ex.
shape.h includes Xfuncproto.h.
svn path=/nixpkgs/trunk/; revision=29505
2011-09-26 22:24:22 +00:00
Shea Levy
8a3f40a088
Get libpciaccess to compile on darwin
...
The added patch uses the correct byte-conversion functions on Apple systems. The library compiles on darwin but is not yet tested.
svn path=/nixpkgs/trunk/; revision=28881
2011-08-29 18:58:59 +00:00
Eelco Dolstra
626b7cd9f4
* Fix the xvinfo build.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27955
2011-07-26 00:04:46 +00:00
Peter Simons
1b53d1f22d
xorg: updated xf86-video-ati to version 6.14.2
...
svn path=/nixpkgs/trunk/; revision=27776
2011-07-14 12:22:49 +00:00
Michael Raskin
04d5aed6d0
Add intel driver prerelease
...
svn path=/nixpkgs/trunk/; revision=26418
2011-03-18 09:10:53 +00:00
Eelco Dolstra
5382f8e934
* xorg-server updated to 1.9.5.
...
svn path=/nixpkgs/trunk/; revision=26417
2011-03-18 09:07:46 +00:00
Michael Raskin
ee75c32a3b
More needed propagations noted for future big update
...
svn path=/nixpkgs/trunk/; revision=26409
2011-03-18 05:32:14 +00:00
Michael Raskin
92a26c823c
Comment about incomplete set of propagatedBuildInputs
...
svn path=/nixpkgs/trunk/; revision=26406
2011-03-17 22:00:22 +00:00
Michael Raskin
1d99933141
Fix xbacklight
...
svn path=/nixpkgs/trunk/; revision=26402
2011-03-17 18:46:25 +00:00
Michael Raskin
3fa36ea4a1
Fix TWM build
...
svn path=/nixpkgs/trunk/; revision=26399
2011-03-17 15:51:13 +00:00
Eelco Dolstra
6ba53ec09a
* Fix xf86-input-synaptics and xf86-input-keyboard.
...
* Enable parallel building for all X.org packages.
svn path=/nixpkgs/branches/x-updates/; revision=25982
2011-02-15 15:54:57 +00:00
Eelco Dolstra
a5aa96c3a3
* xorgserver: propagate dri2proto.
...
svn path=/nixpkgs/branches/x-updates/; revision=25980
2011-02-15 14:34:26 +00:00
Eelco Dolstra
1566609a1a
* libXft: propagate libXrender.
...
svn path=/nixpkgs/branches/x-updates/; revision=25950
2011-02-14 10:14:34 +00:00
Eelco Dolstra
47aa6890d2
* libXaw: propagates libXmu.
...
svn path=/nixpkgs/branches/x-updates/; revision=25948
2011-02-14 10:04:37 +00:00
Eelco Dolstra
0f0d3f9543
* Fix xorg-server.
...
svn path=/nixpkgs/branches/x-updates/; revision=25907
2011-02-11 15:54:01 +00:00
Eelco Dolstra
337e26fea0
* xkbcomp 1.2.1.
...
svn path=/nixpkgs/branches/x-updates/; revision=25906
2011-02-11 15:32:08 +00:00
Eelco Dolstra
8ca86a8114
* Remove libX11 docs.
...
svn path=/nixpkgs/branches/x-updates/; revision=25855
2011-02-09 15:17:15 +00:00
Eelco Dolstra
6a59d1a98f
* Latest Glib, ATK, Pango and GTK+.
...
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages. This
cuts 56 MiB off the closure of GTK+-based packages. It wasn't
really useful anyway because it's not installed in a way that allows
users to find it easily on NixOS. And if you want it, it's faster
to Google it.
svn path=/nixpkgs/branches/x-updates/; revision=25853
2011-02-09 15:09:29 +00:00
Eelco Dolstra
0b8efb0cbb
* X.org 7.6.
...
svn path=/nixpkgs/branches/x-updates/; revision=25818
2011-02-08 17:39:28 +00:00
Michael Raskin
e59ddf7bcb
Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet
...
svn path=/nixpkgs/trunk/; revision=24714
2010-11-16 21:05:54 +00:00
Michael Raskin
fada13658f
Fix xf86inputsynaptics
...
svn path=/nixpkgs/trunk/; revision=24274
2010-10-14 10:51:52 +00:00
Michael Raskin
8a191cddd8
Fix include paths for xf86inputsynaptics
...
svn path=/nixpkgs/trunk/; revision=24259
2010-10-13 11:43:59 +00:00
Eelco Dolstra
4788fc9298
* Some X.org updates.
...
svn path=/nixpkgs/trunk/; revision=24252
2010-10-12 21:52:57 +00:00
Eelco Dolstra
f3677bef0d
* Synaptics driver 1.2.2.
...
svn path=/nixpkgs/trunk/; revision=23091
2010-08-10 14:06:03 +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
e6ff6558d6
* xrandr 1.3.3.
...
svn path=/nixpkgs/branches/x-updates/; revision=22727
2010-07-25 09:14:12 +00:00
Eelco Dolstra
df7091a4a1
* libpciaccess 0.12.0.
...
svn path=/nixpkgs/branches/x-updates/; revision=22684
2010-07-21 11:29:26 +00:00
Eelco Dolstra
78a5abdf85
* Updated the X.org server to 1.8.2. Note that it no longer depends
...
on HAL but instead uses udev to autoconfigure input devices. We'll
have to update the NixOS X server module accordingly, I guess. See
https://fedoraproject.org/wiki/Input_device_configuration .
* Updated Mesa to 7.8.2.
svn path=/nixpkgs/branches/x-updates/; revision=22681
2010-07-20 19:24:21 +00:00
Eelco Dolstra
cb11b171d1
svn path=/nixpkgs/branches/x-updates/; revision=22671
2010-07-20 07:58:36 +00:00
Eelco Dolstra
5ebeb68c72
* Update the imake patch.
...
svn path=/nixpkgs/branches/x-updates/; revision=22660
2010-07-19 10:18:06 +00:00
Eelco Dolstra
0d225fb86a
* Support *.pc.in files that are not in the top directory of the package.
...
svn path=/nixpkgs/branches/x-updates/; revision=22659
2010-07-19 08:59:05 +00:00
Eelco Dolstra
662600c241
* Updated various X.org packages, including libX11.
...
svn path=/nixpkgs/branches/x-updates/; revision=22632
2010-07-18 21:51:13 +00:00
Eelco Dolstra
26164c05c5
* lndir: work properly on directories with st_nlink set to 1 (such as
...
on btrfs). (From David Brown.)
svn path=/nixpkgs/trunk/; revision=22619
2010-07-16 22:04:56 +00:00
Lluís Batlle i Rossell
93d2b4b7bf
Updating the intel x11 video drivers.
...
(I know I modified an automatically generated file, but I don't imagine
well the consequences of this)
svn path=/nixpkgs/trunk/; revision=21248
2010-04-22 20:12:26 +00:00
Lluís Batlle i Rossell
8807722e17
Adding xdm
...
svn path=/nixpkgs/trunk/; revision=20947
2010-04-05 14:09:22 +00:00
Eelco Dolstra
04f73b29d6
* Force a rebuild of the X server, because the current build got
...
corrupted in a crash.
svn path=/nixpkgs/trunk/; revision=20497
2010-03-09 15:35:46 +00:00
Marc Weber
f57a5d2273
libXi: build man pages
...
svn path=/nixpkgs/trunk/; revision=20089
2010-02-18 01:49:53 +00:00
Eelco Dolstra
b1fb08569f
* X.org server updated to 1.7.5.
...
svn path=/nixpkgs/trunk/; revision=20050
2010-02-16 13:34:30 +00:00
Lluís Batlle i Rossell
d47aead668
Setting the difference buildInputs/buildNativeInputs in some gtk related packages.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
2010-01-22 18:49:16 +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
Eelco Dolstra
78718b5a3d
* xorg-server updated to 1.7.4, along with some other X.org packages.
...
svn path=/nixpkgs/trunk/; revision=19387
2010-01-13 11:51:45 +00:00
Eelco Dolstra
3535899507
* Added xinit.
...
svn path=/nixpkgs/trunk/; revision=19236
2010-01-05 14:49:23 +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
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
Eelco Dolstra
bf7a38f3ff
* X.org server 1.7.3.
...
svn path=/nixpkgs/trunk/; revision=18792
2009-12-03 15:51: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
b4e31ce1bf
fixing the name in the openchrome expression.
...
svn path=/nixpkgs/trunk/; revision=18573
2009-11-23 21:40:26 +00:00
Lluís Batlle i Rossell
d8aa5b5db1
Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build
...
inputs did not get in)
Updating the xorg builder script to support cross building (in fact, support
for propagating the required build inputs).
svn path=/nixpkgs/branches/stdenv-updates/; revision=18569
2009-11-23 19:45:18 +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
Lluís Batlle i Rossell
d0d2c6e3fe
Overriding some xorg expressions for them to cross-build. Now SDL cross-builds clean.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18501
2009-11-21 14:49:25 +00:00
Lluís Batlle i Rossell
ca5d91aa60
Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib...
...
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.
I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
2009-11-21 10:44:22 +00:00
Lluís Batlle i Rossell
3136303d63
Fixing the libxcb native build: missing dependency.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=18499
2009-11-21 10:11:44 +00:00
Lluís Batlle i Rossell
4acd0bdb8c
Making xorgserver build also Xnest.
...
svn path=/nixpkgs/trunk/; revision=18395
2009-11-17 16:46:51 +00:00
Lluís Batlle i Rossell
c28701c3d9
Fixing the xdriinfo build.
...
svn path=/nixpkgs/trunk/; revision=18287
2009-11-08 11:34:17 +00:00
Lluís Batlle i Rossell
b02ba2aff8
Updating the xorg dri path patch for dri2.
...
svn path=/nixpkgs/trunk/; revision=18225
2009-11-06 21:15:59 +00:00
Lluís Batlle i Rossell
bbcd6e2728
Fixing the url for the xorg video unichrome driver.
...
prefetching and then realising the expression does not test the url,
I've to keep that in mind.
svn path=/nixpkgs/trunk/; revision=18222
2009-11-06 19:26:00 +00:00
Lluís Batlle i Rossell
9240b56a61
Fixing fonts.alias in the new xorg, and adding a check for the next time
...
they change the fonts.alias path.
svn path=/nixpkgs/trunk/; revision=18210
2009-11-06 15:16:47 +00:00
Lluís Batlle i Rossell
91c8df91bf
Adding the Unichrome xorg video driver, and updating the Openchrome.
...
svn path=/nixpkgs/trunk/; revision=18161
2009-11-05 21:34:31 +00:00
Eelco Dolstra
9a4cd33d10
* Fix the synaptics driver.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18115
2009-11-04 19:53:23 +00:00
Eelco Dolstra
b98502f06a
* Fix xf86inputsynaptics.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18085
2009-11-03 23:54:08 +00:00
Eelco Dolstra
390548d708
* Fix the font packages. They need a --with-fontrootdir flag now.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18043
2009-10-30 08:20:03 +00:00
Eelco Dolstra
1829882a24
svn path=/nixpkgs/branches/xorg-7.5/; revision=18042
2009-10-30 07:41:09 +00:00
Eelco Dolstra
05ff927d83
* Bring back libXxf86misc and xf86miscproto. These were removed from
...
X.org, but some packages still need them.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18038
2009-10-29 18:25:53 +00:00
Eelco Dolstra
28d718aceb
* X.org 7.5.
...
svn path=/nixpkgs/branches/xorg-7.5/; revision=18034
2009-10-29 17:56:10 +00:00
Lluís Batlle i Rossell
9d71e990a1
Updating the openchrome xorg video driver
...
svn path=/nixpkgs/trunk/; revision=17743
2009-10-11 14:41:31 +00:00
Peter Simons
b9b57c6149
Move libXaw fix from default.nix to overrides.nix.
...
svn path=/nixpkgs/trunk/; revision=17620
2009-10-02 18:03:23 +00:00
Peter Simons
1570ccf3cf
libXaw: fixed broken installation in MacOS X
...
See comments in file for further details.
svn path=/nixpkgs/trunk/; revision=17609
2009-10-02 13:57:21 +00:00
Eelco Dolstra
317fd0edd5
* Revert the manual changes to default.nix
...
* Build libSM with the system libuuid on Darwin (in such a way that we
don't get a rebuild on all other platforms).
svn path=/nixpkgs/trunk/; revision=17606
2009-10-02 13:06:35 +00:00
Peter Simons
f2c6df33ba
pkgs/servers/x11/xorg/default.nix: strip trailing white-space
...
svn path=/nixpkgs/trunk/; revision=17601
2009-10-02 12:45:04 +00:00
Peter Simons
abe32ecf99
libSM: use native libuuid when building on MacOS X
...
On Linux, <uuid/uuid.h> and related functions are provided by the util-linux-ng
package, which doesn't build on other operating systems, such as MacOS X. That
platform provides libuuid as part of the system. Hence, to build libSM on
MacOS, we define (empty) variables LIBUUID_CFLAGS and LIBUUID_CFLAGS. Those
settings disable ./configure's attempt to detect libuuid with pkgconfig --
which would fail.
svn path=/nixpkgs/trunk/; revision=17600
2009-10-02 12:44:59 +00:00
Eelco Dolstra
9d15693163
* Make sure that the X server can write the compiled xkb keymap. This
...
requires $out/share/X11/xkb/compiled to be writable, so symlink it
to /var/tmp. Using --with-xkb-output doesn't work in a chroot build
because `make install' tries to write a README.compiled file to
/var/tmp, which doesn't exist in the chroot.
svn path=/nixpkgs/trunk/; revision=17000
2009-09-09 22:16:09 +00:00
Eelco Dolstra
ced7a48e5d
* glx: make the XORG_DRI_DRIVER_PATH environment variable work for the
...
software renderer as well.
svn path=/nixpkgs/trunk/; revision=16943
2009-09-02 22:32:56 +00:00
Lluís Batlle i Rossell
116c1e4bdd
Adding the proper derivation name to the openchrome xorg driver override.
...
svn path=/nixpkgs/trunk/; revision=16781
2009-08-19 20:19:33 +00:00
Lluís Batlle i Rossell
dab4dc0de1
Using openchrome trunk instead of that distributed with xorg. That
...
doesn't work in K8N800, and trunk even does a bit of 3D by hw.
svn path=/nixpkgs/trunk/; revision=16329
2009-07-11 10:32:27 +00:00
Eelco Dolstra
645c91708f
* Updated some drivers.
...
svn path=/nixpkgs/trunk/; revision=16002
2009-06-18 17:20:01 +00:00