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

3609 commits

Author SHA1 Message Date
Yury G. Kudryashov f943cf8d81 nut-2.6.3: add freeipmi support 
svn path=/nixpkgs/trunk/; revision=33478
 2012-03-29 20:44:20 +00:00
Yury G. Kudryashov c6c798df43 Add nut-2.6.3 without HAL support 
I'm not a nut user, so I didn't touch the default nut expression, and set
meta.priority to 10.

svn path=/nixpkgs/trunk/; revision=33477
 2012-03-29 19:01:42 +00:00
Yury G. Kudryashov ce85d430bc Batch update telepathy-related packages 
Some of these packages need glib-2.30.x, so I commit it to this branch.

Add sofia-sip and telepathy-rakia.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33475
 2012-03-29 16:33:32 +00:00
Michael Raskin 3decf956d4 Porting a fix from nixpkgs trunk - vimprobable2 now builds (against obsolete WebKit/GTK2) 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33467
 2012-03-29 10:30:47 +00:00
Yury G. Kudryashov 3c72ac97eb Fix typo 
svn path=/nixpkgs/trunk/; revision=33466
 2012-03-29 10:17:40 +00:00
Yury G. Kudryashov a87c8d9bee Add telepathy-logger 
svn path=/nixpkgs/trunk/; revision=33457
 2012-03-28 19:23:42 +00:00
Yury G. Kudryashov defd86049c Merge ^/nixpkgs/trunk. 
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
 2012-03-28 15:42:42 +00:00
Mathijs Kwik a6238bce68 avidemux: upgraded to 2.5.6 
- added support for vp8 (libvpx)
- added support for xvid
- added support for libva output

svn path=/nixpkgs/trunk/; revision=33447
 2012-03-28 08:40:41 +00:00
Russell O'Connor bba264d897 Adding forgotten configure_130312 patch for matitia. 
svn path=/nixpkgs/trunk/; revision=33433
 2012-03-26 19:11:25 +00:00
Russell O'Connor ec5dda12d2 Reparing stable build of Matita. 
Also correcting the version and simplifying the prerelease package of Matita.


svn path=/nixpkgs/trunk/; revision=33420
 2012-03-25 21:27:30 +00:00
Russell O'Connor 510308e039 Adding a package for a preview release of Matita. 
svn path=/nixpkgs/trunk/; revision=33418
 2012-03-25 20:43:00 +00:00
Lluís Batlle i Rossell 00dc25ba43 Making wrapFirefox also propagate the browser to the userenv, so it gets 
the manpages. That's useful for vimperator2 for example.


svn path=/nixpkgs/trunk/; revision=33417
 2012-03-25 20:21:45 +00:00
Lluís Batlle i Rossell 778abfc6c0 Updating vimprobable2. 
svn path=/nixpkgs/trunk/; revision=33416
 2012-03-25 20:16:01 +00:00
Lluís Batlle i Rossell 0589bffdf4 Typo of semicolon. 
svn path=/nixpkgs/trunk/; revision=33415
 2012-03-25 20:11:32 +00:00
Lluís Batlle i Rossell f389901fd2 Adding 'tabbed'. I think Alexander Foremny wanted to send this patch 
long ago, but I could not find it.


svn path=/nixpkgs/trunk/; revision=33414
 2012-03-25 20:10:25 +00:00
Lluís Batlle i Rossell e4443dfc8d Telling hydra to build vimprobable. 
svn path=/nixpkgs/trunk/; revision=33402
 2012-03-25 11:39:43 +00:00
Michael Raskin 99f198ab9f Update/fix Midori 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33400
 2012-03-25 11:22:32 +00:00
Cillian de Roiste 9810e6110f Upgrading to 2.0.1, bugfix for smb error. Thanks to Kirill Elagin 
svn path=/nixpkgs/trunk/; revision=33398
 2012-03-24 19:52:46 +00:00
Cillian de Roiste d2d41e9b78 Adding mhwaveedit, a sample editor 
svn path=/nixpkgs/trunk/; revision=33397
 2012-03-24 18:59:26 +00:00
Cillian de Roiste a305102589 Adding Petri-Foo, a fork of the Specimen sampler project 
svn path=/nixpkgs/trunk/; revision=33395
 2012-03-24 13:22:14 +00:00
Peter Simons 880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use. 
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
 2012-03-24 10:21:28 +00:00
Yury G. Kudryashov ea335bb574 Calligra-2.4 RC2 
Blind commit. Let Hydra build it.

svn path=/nixpkgs/trunk/; revision=33391
 2012-03-24 06:35:16 +00:00
Peter Simons e58d3914bb haskell-mode: updated to version 2.8.0.29-g7682f99 
svn path=/nixpkgs/trunk/; revision=33380
 2012-03-23 12:03:23 +00:00
Cillian de Roiste 438f877d82 Removing specimen, the release doesn't work and the svn repo is no longer available :( 
svn path=/nixpkgs/trunk/; revision=33362
 2012-03-22 19:56:48 +00:00
Cillian de Roiste 464a05818e Upgrading Qtractor to 0.5.4 
svn path=/nixpkgs/trunk/; revision=33361
 2012-03-22 18:49:57 +00:00
Eelco Dolstra acf3b221a7 * Make English the default language for LibreOffice. 
svn path=/nixpkgs/trunk/; revision=33352
 2012-03-22 10:44:57 +00:00
Cillian de Roiste 3a86557b7c Tidy up: style 
svn path=/nixpkgs/trunk/; revision=33351
 2012-03-22 10:36:48 +00:00
Arie Middelkoop c2e7aa68e4 Bumb of Chromium version. I've been using this one for a while now. 
svn path=/nixpkgs/trunk/; revision=33348
 2012-03-22 10:29:43 +00:00
Michael Raskin 8dddfbeea6 Update/fix Uzbl 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33340
 2012-03-21 19:14:34 +00:00
Cillian de Roiste ec9ed33730 Fixing hydrogen so that it builds with scons 2.1, using the patch from http://www.assembla.com/spaces/hydrogen/tickets/204-hydrogen-0-9-5-doesn-t-install-with-scons-2-1-0 
svn path=/nixpkgs/trunk/; revision=33336
 2012-03-21 17:16:37 +00:00
Shea Levy 0728828fac Remove old Thunderbird with Eelco's blessing 
svn path=/nixpkgs/trunk/; revision=33335
 2012-03-21 17:15:39 +00:00
Peter Simons 4f576ac4b5 pkgs/applications/editors/emacs-modes/haskell: updated haskell-mode to the latest version from Github 
svn path=/nixpkgs/trunk/; revision=33326
 2012-03-21 11:46:18 +00:00
Shea Levy f67b9d8f2d Thunderbird: Blind update 
svn path=/nixpkgs/trunk/; revision=33320
 2012-03-21 01:26:21 +00:00
Eelco Dolstra b449705587 * Firefox 11 (contributed by Kirill Elagin). Unfortunately it's not 
called "Firefox" anymore when built without official branding.
  Apparently that was a SNAFU in Firefox 10.

svn path=/nixpkgs/trunk/; revision=33319
 2012-03-20 23:59:09 +00:00
Eelco Dolstra f682391220 * Fix Firefox desktop item. Contributed by Kirill Elagin. 
svn path=/nixpkgs/trunk/; revision=33316
 2012-03-20 23:23:00 +00:00
Lluís Batlle i Rossell 2ce433c26c Removing go-oo. It neither builds neither upstream continues it. 
svn path=/nixpkgs/trunk/; revision=33314
 2012-03-20 22:19:48 +00:00
Russell O'Connor f9a5fa373e Upgrading HOL4 to version k.7. 
svn path=/nixpkgs/trunk/; revision=33306
 2012-03-20 19:11:22 +00:00
Cillian de Roiste efcc0c9b1e Adding some notes on why ardour2 is not working, perhaps someone else can take this up, or else we just remove ardour2 when ardour3 is released. 
svn path=/nixpkgs/trunk/; revision=33305
 2012-03-20 18:53:01 +00:00
Cillian de Roiste 49fabfacab Upgrading ardour3-svn to beta3, currently ardour2 does not run. 
svn path=/nixpkgs/trunk/; revision=33303
 2012-03-20 18:41:03 +00:00
Yury G. Kudryashov 102a1d82e7 Oops, fix kdevelop-4.3.0 hash 
svn path=/nixpkgs/trunk/; revision=33299
 2012-03-20 16:17:46 +00:00
Eelco Dolstra 73ce1dd4bb * Adobe Reader: install .desktop file in the right place. 
svn path=/nixpkgs/trunk/; revision=33297
 2012-03-20 14:41:24 +00:00
Yury G. Kudryashov 34fcba81be Add new release of kdevelop 
I'll remove the old release when Hydra will build the new one, and I'll test the
result.

svn path=/nixpkgs/trunk/; revision=33296
 2012-03-20 14:12:53 +00:00
Eelco Dolstra bd8d003d69 * VirtualBox updated to 4.1.10. Drop the wrapper script since it no 
longer seems needed.  Optionally build the Python bindings.  Disable
  the Java bindings by default to prevent a gratuitous dependency on
  the JDK.

svn path=/nixpkgs/trunk/; revision=33295
 2012-03-20 13:54:01 +00:00
Yury G. Kudryashov a6ef1ee30a Add champlain support to geeqie 
This commit reverts 33187 and changes libchamplain arg to libchamplain_0_6.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33292
 2012-03-20 11:16:10 +00:00
Yury G. Kudryashov 0d90c06ba1 Remove some packages with Qt3 dependency 
kde3.k3b: use kde4.k3b instead
kde3.kphone: there are many other SIP phones
valknut: last version from 2009, doesn't support new ADC protocol
qdu: latest release in 2004, use kde4.filelight

REVIEWBOARD:5

svn path=/nixpkgs/trunk/; revision=33273
 2012-03-19 18:31:02 +00:00
Eelco Dolstra 512357f875 * Remove a wildly outdated Git version that shouldn't have been in 
Nixpkgs in the first place.

svn path=/nixpkgs/trunk/; revision=33272
 2012-03-19 18:24:53 +00:00
Piotr Pietraszkiewicz fbfa56c165 bumped bibletime to v2.9.1 which has the side effect that it builds again 
svn path=/nixpkgs/trunk/; revision=33245
 2012-03-18 23:52:58 +00:00
Lluís Batlle i Rossell b4955eea65 Adding qemu 1.0.1. 
svn path=/nixpkgs/trunk/; revision=33232
 2012-03-18 10:31:15 +00:00
Lluís Batlle i Rossell 5475f367a5 Adding patch for grip (sent by Ilja Honkonen). 
I reworked the spacing.


svn path=/nixpkgs/trunk/; revision=33229
 2012-03-18 09:24:42 +00:00
Yury G. Kudryashov 062d040413 Let hydra build telepathy-salut 
svn path=/nixpkgs/trunk/; revision=33216
 2012-03-17 20:57:24 +00:00
Yury G. Kudryashov 11410436e5 Let hydra build kde-telepathy 
svn path=/nixpkgs/trunk/; revision=33210
 2012-03-17 17:35:29 +00:00
Yury G. Kudryashov 776bedbb5f Remove some files not reachable from all-packages.nix 
List of removed files:
* pkgs/applications/misc/kiwixbuilder/default.nix
* pkgs/applications/misc/simgrid/default.nix
* pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
* pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
* pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
* pkgs/development/libraries/bluez-libs/default.nix
* pkgs/development/libraries/libjingle/0.4.0.nix
* pkgs/development/perl-modules/Font-TTF/default.nix
* pkgs/tools/X11/xauth/default.nix
* pkgs/tools/security/p0f/default.nix
* pkgs/tools/security/p0f/p0f.patch

svn path=/nixpkgs/trunk/; revision=33205
 2012-03-17 17:20:30 +00:00
Yury G. Kudryashov f0925eeded pidgin-2.10.2 
Use rec to prevent "name != src.basename" in the future.
REVIEW:6

svn path=/nixpkgs/trunk/; revision=33204
 2012-03-17 17:12:48 +00:00
Marco Maggesi dba8b32385 Update HOL Light to rev 128 
svn path=/nixpkgs/trunk/; revision=33196
 2012-03-17 16:36:36 +00:00
Marco Maggesi 699de0f3f9 Fix building of Coq and update to version 8.3pl3. (Forgot to save files) 
svn path=/nixpkgs/trunk/; revision=33195
 2012-03-17 16:30:23 +00:00
Marco Maggesi af37461b11 Fix building of Coq and update to version 8.3pl3. 
svn path=/nixpkgs/trunk/; revision=33194
 2012-03-17 16:26:20 +00:00
Yury G. Kudryashov 23dbae430f Disable libchamplain support in geeqie 
It depends on old libchamplain which fails to build with newer glib.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33187
 2012-03-17 13:30:36 +00:00
Florian Friesdorf 88e5f7e2c7 conkeror-1.0pre-20120316 
svn path=/nixpkgs/trunk/; revision=33185
 2012-03-17 09:18:11 +00:00
Florian Friesdorf 9fd94809e5 notmuch-0.11.1 
svn path=/nixpkgs/trunk/; revision=33184
 2012-03-17 09:18:06 +00:00
Cillian de Roiste c8900990a7 Updating ardour to the 2.8.12 svn tag (2.8.2 doesn't compile), hopefully this works although the comment from Marc Weber suggests that the hash will change over time. This builds for me but fails to start giving the following error: 
raptor_new_uri_for_rdf_concept called with Raptor V1 world object
raptor_general.c:240:raptor_init: fatal error: raptor_init() failedAborted

https://qa.mandriva.com/show_bug.cgi?id=65072 looks similar, but adding liblrdf (0.4.0) as an input, doesn't help.

svn path=/nixpkgs/trunk/; revision=33181
 2012-03-16 22:28:21 +00:00
Yury G. Kudryashov 707bf75144 mythth-0.24.2 
New dependencies:
* Qt4
* Pulseaudio (optional but I've hardcoded it)
* fftw (single precision)

svn path=/nixpkgs/trunk/; revision=33180
 2012-03-16 22:26:26 +00:00
Yury G. Kudryashov 0ebb258668 telepathy: don't include unstable in full 
svn path=/nixpkgs/trunk/; revision=33179
 2012-03-16 22:22:50 +00:00
Cillian de Roiste 0546a7e79a Updating mumble to 1.2.3 and adding pkgconfig as an input as it fails to build without it. 
svn path=/nixpkgs/trunk/; revision=33169
 2012-03-16 19:19:00 +00:00
Yury G. Kudryashov 75207a6a90 Try to update slr 
Still fails to build because atlas doesn't provide full blas.

svn path=/nixpkgs/trunk/; revision=33164
 2012-03-16 17:15:52 +00:00
Peter Simons 46f9f71439 git: updated to version 1.7.9.4 
svn path=/nixpkgs/trunk/; revision=33145
 2012-03-16 09:47:34 +00:00
Yury G. Kudryashov 2aed4ebe88 Add telepathy-salut 
svn path=/nixpkgs/trunk/; revision=33143
 2012-03-16 06:58:03 +00:00
Lluís Batlle i Rossell 1677493301 Libreoffice wants a newer libvisio. 
svn path=/nixpkgs/trunk/; revision=33126
 2012-03-15 21:41:40 +00:00
Lluís Batlle i Rossell 8849219c81 Trying to update libreoffice to the version today released. Cross fingers; we can revert this, if it does not work. 
svn path=/nixpkgs/trunk/; revision=33117
 2012-03-15 19:50:23 +00:00
Peter Simons 6ff954a5e8 git-annex: updated to version 3.20120315 
svn path=/nixpkgs/trunk/; revision=33116
 2012-03-15 18:07:49 +00:00
Lluís Batlle i Rossell 6fe531299e Avoiding the wrapper in libreoffice, and trying to use '-lcups'. 
svn path=/nixpkgs/trunk/; revision=33113
 2012-03-15 16:45:04 +00:00
Lluís Batlle i Rossell 3337fa7b87 Adding the cups lib path to ld_libraray_path for libreoffice to be able to 
print with cups.

That would have been also the fix for go-oo for this problem, I think.


svn path=/nixpkgs/trunk/; revision=33112
 2012-03-15 16:38:24 +00:00
Lluís Batlle i Rossell 1ebf45400a Making more symlinks in libreoffice. 
svn path=/nixpkgs/trunk/; revision=33105
 2012-03-15 11:29:13 +00:00
Lluís Batlle i Rossell 5c0c0ff632 Adding a '$out/bin/soffice' link to the libreoffice soffice binary. 
svn path=/nixpkgs/trunk/; revision=33104
 2012-03-15 11:02:52 +00:00
Yury G. Kudryashov bd17f891dd +1 patch (from Gentoo) 
svn path=/nixpkgs/trunk/; revision=33094
 2012-03-14 23:34:30 +00:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal 
svn path=/nixpkgs/trunk/; revision=33092
 2012-03-14 22:44:52 +00:00
Yury G. Kudryashov 03875e0bce Make nixpkgs ready to gtkLibs attrset removal 
svn path=/nixpkgs/trunk/; revision=33091
 2012-03-14 22:44:41 +00:00
Shea Levy 6c99fad938 OMVF: Only need some of the sources, and symlinks instead of copies are fine 
svn path=/nixpkgs/trunk/; revision=33090
 2012-03-14 22:43:07 +00:00
Yury G. Kudryashov 003b24ac45 Trying to fix k3d build 
svn path=/nixpkgs/trunk/; revision=33089
 2012-03-14 21:57:43 +00:00
Yury G. Kudryashov 68fe867e19 Get rid of most references to gtkLibs 
svn path=/nixpkgs/trunk/; revision=33088
 2012-03-14 21:57:32 +00:00
Lluís Batlle i Rossell fd1867ec92 The libreoffice expression needs the 'help' package, or it fails on install. 
(or pass --disable-help, I think).

Thus, the fontconfig tests now pass, I remove the disabletests patch.

I also removed some configure options that configure did not understand
anymore. They were picked from older openoffice expressions.


svn path=/nixpkgs/trunk/; revision=33087
 2012-03-14 21:51:33 +00:00
Lluís Batlle i Rossell bed87f75ca Updating paraview. 
svn path=/nixpkgs/trunk/; revision=33086
 2012-03-14 21:50:17 +00:00
Lluís Batlle i Rossell ae7b8e3907 Updating truecrypt, as the old url didn not work already. 
Notified by kirelagin@freenode


svn path=/nixpkgs/trunk/; revision=33085
 2012-03-14 21:28:42 +00:00
Yury G. Kudryashov a05e5e7add mysql-workbench needs gnome-keyring as well 
svn path=/nixpkgs/trunk/; revision=33083
 2012-03-14 19:39:04 +00:00
Yury G. Kudryashov f105c2353b Pass libgnome_keyring, not gnome_keyring 
svn path=/nixpkgs/trunk/; revision=33082
 2012-03-14 19:35:55 +00:00
Yury G. Kudryashov 044361ec18 Pass qt_gstreamer to ktp-call-ui 
svn path=/nixpkgs/trunk/; revision=33080
 2012-03-14 19:35:46 +00:00
Yury G. Kudryashov 7a31872261 Add kde4.telepathy.call_ui 
Very experimental, fails to build (missing deps)

svn path=/nixpkgs/trunk/; revision=33077
 2012-03-14 19:35:30 +00:00
Lluís Batlle i Rossell a288984843 Fixing another script shebang in libreoffice. And the lang configure parameter. 
svn path=/nixpkgs/trunk/; revision=33074
 2012-03-14 18:51:59 +00:00
Lluís Batlle i Rossell 73f9e302a0 I think libreoffice does not want the 'en-US' language anymore. 
svn path=/nixpkgs/trunk/; revision=33071
 2012-03-14 17:49:23 +00:00
Yury G. Kudryashov 0a7c3ff061 Add telepathy-mission-control 
svn path=/nixpkgs/trunk/; revision=33066
 2012-03-14 16:28:11 +00:00
Yury G. Kudryashov 4874ff1144 Move some IM clients to instant-messengers/ 
svn path=/nixpkgs/trunk/; revision=33065
 2012-03-14 15:41:44 +00:00
Yury G. Kudryashov dc2d99ec96 Move telepathy-gabble to applications 
svn path=/nixpkgs/trunk/; revision=33064
 2012-03-14 15:41:37 +00:00
Yury G. Kudryashov cddd413130 Add KDE-Telepathy 
It compiles but I haven't tried to run it.

svn path=/nixpkgs/trunk/; revision=33063
 2012-03-14 09:52:21 +00:00
Lluís Batlle i Rossell 3418970f3b Making libreoffice have a configured fontconfig. I hope this will make some cppunit tests work, and thus we would not need to disable them. 
I update the patch that disables tests with one more test disabled, but I don't
use it because I hope the build with fonts.conf will work fine. If that is the case,
I'll remove the patch file later. If the fonts.conf trick does not work, I may want
to extend the patch to disable all failing cases.


svn path=/nixpkgs/trunk/; revision=33062
 2012-03-14 09:40:26 +00:00
Shea Levy 80f47974b7 OVMF: Actually support i686 
svn path=/nixpkgs/trunk/; revision=33060
 2012-03-14 07:29:11 +00:00
Shea Levy 6cf8e4f815 EDK2: Significant cleanup and 
modularization, and add OVMF as an example of how to use it

svn path=/nixpkgs/trunk/; revision=33059
 2012-03-14 06:57:58 +00:00
Lluís Batlle i Rossell 63b934c36f Next attempt at building libreoffice. I reached it to build it in the build environment, 
but I don't know if make install will succeed.

I also added the translations, that could work with luck.

I removed the force field.


svn path=/nixpkgs/trunk/; revision=33048
 2012-03-13 21:23:25 +00:00
Eelco Dolstra c6ac45f832 * Tribler updated to 5.5.21. 
svn path=/nixpkgs/trunk/; revision=33036
 2012-03-13 17:35:11 +00:00
Lluís Batlle i Rossell 1b7e6447f9 Fix for an early build failure of libreoffice. Enabling it for hydra to see if it builds further. 
svn path=/nixpkgs/trunk/; revision=33026
 2012-03-12 21:38:00 +00:00
Lluís Batlle i Rossell 6b88ad4b16 I try to package libreoffice 3.5, as there was a weird segfault in 3.4, and they 
changed the build system in 3.5. It still does not build either... hopefully
by more reachable troubles.

svn path=/nixpkgs/trunk/; revision=33022
 2012-03-12 20:15:08 +00:00
Peter Simons c86a90c4e9 Updating Haskell packages. 
- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
 2012-03-12 14:06:18 +00:00