Ben Hutchings
e126ae3d01
Bump ABI to 2 ( Closes : #761874 )
...
svn path=/dists/sid/linux/; revision=21853
2014-09-16 17:30:00 +00:00
Aurelien Jarno
71938a1fc5
Fix previous broken commit
...
svn path=/dists/sid/linux/; revision=21850
2014-09-16 07:23:21 +00:00
Aurelien Jarno
718b0facc8
[powerpc/powerpc64,ppc64el] Backport more KVM patches from 3.17. Enable
...
KVM_BOOK3S_64_HV, KVM_BOOK3S_64_PR and KVM_XICS, but keep KVM_BOOK3S_64
disabled for now as it would trigger an ABI change (Partially addresses:
#761656 ).
usb/gadget: Enable USB_NET2280 as module
svn path=/dists/sid/linux/; revision=21849
2014-09-16 07:21:54 +00:00
Ben Hutchings
83eeb618bc
sfc: Add support for Solarflare 7000 series 40G network adapters
...
Most of the necessary code already went into 3.12, so this is a small change.
svn path=/dists/sid/linux/; revision=21846
2014-09-15 02:44:00 +00:00
Ian Campbell
ec483632c6
[armhf] Enable support for Exynos5 systems. ( Closes : #759291 )
...
Tested on original Arndale with serial, MMC and NIC. No udeb support yet.
svn path=/dists/sid/linux/; revision=21845
2014-09-14 19:09:30 +00:00
Ben Hutchings
131869f1db
Add missing bug #
...
svn path=/dists/sid/linux/; revision=21844
2014-09-14 14:52:26 +00:00
Ben Hutchings
6cb0a835c8
reiserfs: Apply critical fixes
...
Two patches in 3.17 cc'd to stable, one of which is an easily
triggered data loss bug (#761457 ).
svn path=/dists/sid/linux/; revision=21843
2014-09-13 23:24:14 +00:00
Ben Hutchings
4bafad72b0
drivers/mfd/rtsx_usb.c: export device table ( Closes : #761428 )
...
svn path=/dists/sid/linux/; revision=21842
2014-09-13 21:28:30 +00:00
Ben Hutchings
d624ad0698
Prepare to release linux (3.16.2-3).
...
svn path=/dists/sid/linux/; revision=21837
2014-09-13 05:25:30 +00:00
Ben Hutchings
b6268eb4c3
Fix grammar errors in my changelog entries
...
svn path=/dists/sid/linux/; revision=21836
2014-09-13 02:49:45 +00:00
Ben Hutchings
816a86c97a
libceph: Apply critical fixes
...
Several patches in 3.17 cc'd to stable, all of which look security-
relevant though I don't think they have CVE IDs.
svn path=/dists/sid/linux/; revision=21835
2014-09-13 02:46:54 +00:00
Ben Hutchings
fbff0a02fd
udeb: Fix typo in dependencies of speakup-modules
...
We currently FTBFS on mips64el:
cannot read /tmp/linux/linux-3.16.2/debian/installer/mips64el/modules/mips64el-sb1-bcm91250a/mips64el-sb1-bcm91250a
...
cannot read /tmp/linux/linux-3.16.2/debian/installer/mips64el/modules/mips64el-loongson-3/mips64el-loongson-3
...
find: `debian/speakup-modules-3.16-1-loongson-3-di': No such file or directory
speakup-modules-3.16-1-loongson-3-di will be empty
The 'cannot read' warnings are due to a bug in kernel-wedge
copy-modules (fixed in version 2.90) that affects module list
directories that are symlinked. Instead of getting a list of files
and symlinks in the directory, it only finds the directory-symlink.
The bug was generally harmless because copy-modules also gets a
list of inter-package dependencies (without relying on the first
list), and this includes all package names. Except that
speakup-modules has 'Depends: kernel-image!', and as there is
no package definition for 'kernel-image!' this dependency is
not included in the second list and copy-modules does not see
'speakup-modules'.
mips64el seems to be the only architecture which has a symlink to a
module list directory including speakup-modules.
Delete the '!'.
svn path=/dists/sid/linux/; revision=21834
2014-09-13 02:30:57 +00:00
Aurelien Jarno
ad2d30001b
[mips64el] Drop loongson-2e and loongson-2f flavour as the minimum
...
supported ISA will be at least MIPS64.
svn path=/dists/sid/linux/; revision=21833
2014-09-12 22:00:07 +00:00
Ben Hutchings
86d65bc599
Defer enabling SATA_ZPODD and TRACER_SNAPSHOT to next ABI bump
...
svn path=/dists/sid/linux/; revision=21832
2014-09-12 18:41:12 +00:00
Ben Hutchings
ed1059ae90
Add ABI reference files for 3.16-1
...
svn path=/dists/sid/linux/; revision=21831
2014-09-12 18:04:57 +00:00
Ben Hutchings
2762ad1f92
debian/rules.real: Never make kernel-wedge errors non-fatal
...
Currently we set KW_CHECK_NONFATAL=y when building for experimental or
an unreleased package. In theory people would be checking for
kernel-wedge errors in the build logs. In practice this meant we
didn't see them until they appear in unstable where they are fatal.
svn path=/dists/sid/linux/; revision=21830
2014-09-12 17:01:30 +00:00
Ben Hutchings
26d8ba188e
Revert "drivers/base: Disable UEVENT_HELPER; long obsoleted by udev"
...
wheezy's udev init script requires /sys/kernel/uevent_helper as an
indicator of hotplug support. We can't remove it until after the
jessie release.
svn path=/dists/sid/linux/; revision=21829
2014-09-12 16:21:19 +00:00
Ian Campbell
64d07e85d9
[arm64] Backport xgene Ethernet and include phy-xgene in udebs
...
phy-xgene is needed for ahci_xgene not the Ethernet driver, so place in
sata-modules for now. While there move ahci_xgene from the toplevel list into
the arm64 specific list.
svn path=/dists/sid/linux/; revision=21828
2014-09-12 15:20:43 +00:00
Ben Hutchings
ec2241f23d
[armhf] deb-pkg: Add automatic support for armhf architecture
...
svn path=/dists/sid/linux/; revision=21827
2014-09-12 14:29:43 +00:00
Ben Hutchings
39f03a5534
[ppc64el] deb-pkg: Add support for powerpc little endian
...
svn path=/dists/sid/linux/; revision=21826
2014-09-12 14:24:52 +00:00
Ben Hutchings
a3b4639c85
builddeb: put the dbg files into the correct directory
...
svn path=/dists/sid/linux/; revision=21825
2014-09-12 14:20:46 +00:00
Ben Hutchings
a3cf070da5
udeb: Add many wireless drivers to nic-wireless-modules
...
svn path=/dists/sid/linux/; revision=21824
2014-09-12 14:20:16 +00:00
Ben Hutchings
098e1cc1c0
Re-group patches in series
...
svn path=/dists/sid/linux/; revision=21823
2014-09-12 13:44:38 +00:00
Ben Hutchings
e77d849b25
Move x86-specific memtest patch into the right directory
...
svn path=/dists/sid/linux/; revision=21822
2014-09-12 13:42:28 +00:00
Ben Hutchings
0beb6526a3
SCSI: aic94xx: Remove broken fallback for missing Ctrl-A user settings
...
svn path=/dists/sid/linux/; revision=21821
2014-09-12 13:38:52 +00:00
Ben Hutchings
b705f88f51
i2o: Disable I2O_EXT_ADAPTEC on 64-bit, as it assumes 32-bit virtual addresses
...
svn path=/dists/sid/linux/; revision=21820
2014-09-12 13:32:22 +00:00
Ben Hutchings
b2efa14d0b
Fix compiler warnings in drivers/net/phy/marvell.c after disabling 4-port PHYs
...
svn path=/dists/sid/linux/; revision=21819
2014-09-12 13:10:45 +00:00
Ben Hutchings
b57dc00e8d
r8723au: Explicitly set driver config options to defaults
...
svn path=/dists/sid/linux/; revision=21818
2014-09-12 13:06:03 +00:00
Ben Hutchings
8e2b47b9d2
leds: Enable LEDS_TRIGGER_CPU as built-in since it cannot be modular
...
svn path=/dists/sid/linux/; revision=21817
2014-09-12 13:02:50 +00:00
Ben Hutchings
9d284e6a76
[!x86] staging: Enable R8712U as module ( Closes : #742055 )
...
svn path=/dists/sid/linux/; revision=21816
2014-09-12 06:11:17 +00:00
Ben Hutchings
3012841ea7
Note that enabling INTEL_SMARTCONNECT closes #749273
...
svn path=/dists/sid/linux/; revision=21815
2014-09-12 06:04:36 +00:00
Ben Hutchings
946fde874a
[ppc64*] Explicitly enable VSX (already selected by PPC_TRANSACTIONAL_MEM
...
svn path=/dists/sid/linux/; revision=21814
2014-09-12 05:49:21 +00:00
Ben Hutchings
8af1659921
[!x86] staging: Enable R8188EU as module ( Closes : #760859 )
...
svn path=/dists/sid/linux/; revision=21813
2014-09-12 05:48:22 +00:00
Ben Hutchings
e4829c2d7d
drivers/base: Disable UEVENT_HELPER; long obsoleted by udev
...
svn path=/dists/sid/linux/; revision=21812
2014-09-12 05:30:42 +00:00
Ben Hutchings
dfb5e384b3
[x86] Disable USB_SN9C102; this driver is deprecated in favour of the gspca drivers
...
While we're doing this, move all the staging/media driver disables
into debian/config/kernelarch-x86/config as STAGING_MEDIA is only
enabled on x86.
svn path=/dists/sid/linux/; revision=21811
2014-09-12 05:29:24 +00:00
Ben Hutchings
a371875c1b
Enable many new(ish) drivers and other features
...
svn path=/dists/sid/linux/; revision=21810
2014-09-12 05:25:26 +00:00
Ben Hutchings
4376ec2f94
Explicitly set many config symbols to their defaults
...
svn path=/dists/sid/linux/; revision=21809
2014-09-12 04:07:56 +00:00
Ben Hutchings
295134a392
[mips64,mips64el] Properly add the 5kc-malta flavour (should fix FTBFS)
...
svn path=/dists/sid/linux/; revision=21808
2014-09-11 23:11:32 +00:00
Ben Hutchings
c4d465c9ae
mmc,memstick: Enable MMC_REALTEK_USB, MEMSTICK_REALTEK_USB as modules
...
svn path=/dists/sid/linux/; revision=21807
2014-09-11 04:36:47 +00:00
Ben Hutchings
c9d97d2730
Explicitly set many config symbols to their defaults
...
svn path=/dists/sid/linux/; revision=21806
2014-09-11 04:20:33 +00:00
Ben Hutchings
a25d64fe99
[amd64] Explicitly enable X86_16BIT per default
...
svn path=/dists/sid/linux/; revision=21805
2014-09-11 03:04:14 +00:00
Ben Hutchings
da9022cd10
Explicitly enable SGETMASK_SYSCALL on various architectures per default
...
svn path=/dists/sid/linux/; revision=21804
2014-09-11 03:01:06 +00:00
Ben Hutchings
80d9c6fcad
mfd: Enable MFD_RTSX_USB as module ( Closes : #761099 )
...
svn path=/dists/sid/linux/; revision=21803
2014-09-11 02:56:32 +00:00
Ian Campbell
be11f37efd
[armel/orion5x] udeb: Include mvmdio in nic-modules udeb.
...
svn path=/dists/sid/linux/; revision=21802
2014-09-10 09:19:23 +00:00
Ben Hutchings
9c46c1cf9e
[arm64] Enable more X-Gene drivers as modules
...
svn path=/dists/sid/linux/; revision=21801
2014-09-09 12:57:53 +00:00
Ben Hutchings
c8ec0ef68c
[armhf] udeb: Remove efi-modules, as EFI is not yet supported on ARM!
...
svn path=/dists/sid/linux/; revision=21800
2014-09-09 12:42:30 +00:00
Ben Hutchings
cff52dd79c
Prepare to release linux (3.16.2-2).
...
svn path=/dists/sid/linux/; revision=21788
2014-09-08 17:39:59 +00:00
Ben Hutchings
d53fe15ef5
[armel,mips*] udeb: Remove lzo-modules, as LZO_COMPRESS is now built-in (fixes FTBFS)
...
svn path=/dists/sid/linux/; revision=21787
2014-09-08 17:24:27 +00:00
Ben Hutchings
53bbfdd416
Prepare to release linux (3.16.2-1).
...
svn path=/dists/trunk/linux/; revision=21784
2014-09-08 03:51:53 +00:00
Ben Hutchings
5187f83279
MAINTAINERS: Change aufs entry to say it's not upstream
...
svn path=/dists/trunk/linux/; revision=21783
2014-09-08 02:16:51 +00:00
Ben Hutchings
7f39df6413
aufs: Update to aufs3.16-20140908
...
svn path=/dists/trunk/linux/; revision=21782
2014-09-08 01:24:43 +00:00
Ben Hutchings
ee96a22642
[armel/kirkwood] mm: Enable HIGHMEM ( Closes : #760786 )
...
svn path=/dists/trunk/linux/; revision=21781
2014-09-07 23:25:42 +00:00
Ben Hutchings
55e62d8bde
Move recently added patches into the right sections of the series
...
svn path=/dists/trunk/linux/; revision=21780
2014-09-07 23:06:15 +00:00
Ben Hutchings
6e71d64b0c
Add two more CVE IDs for a fix in 3.16.2
...
svn path=/dists/trunk/linux/; revision=21779
2014-09-07 23:03:52 +00:00
Ben Hutchings
8cd5605168
Note that CVE-2014-5207 was fixed along with CVE-2014-5206
...
svn path=/dists/trunk/linux/; revision=21778
2014-09-07 23:00:41 +00:00
Ben Hutchings
7dd2587507
mnt: Fix flag handling on remount (CVE-2014-5206)
...
- mnt: Only change user settable mount flags in remount
- mnt: Move the test for MNT_LOCK_READONLY from change_mount_flags into
do_remount
- mnt: Correct permission checks in do_remount
- mnt: Change the default remount atime from relatime to the existing value
- mnt: Add tests for unprivileged remount cases that have found to be faulty
svn path=/dists/trunk/linux/; revision=21777
2014-09-07 22:57:20 +00:00
Ben Hutchings
f2b6484a69
[i386/686-pae] Don't try to enable XO15_EBOOK
...
It depends on OLPC, which is only enabled on i386/486.
svn path=/dists/trunk/linux/; revision=21776
2014-09-07 20:46:18 +00:00
Ben Hutchings
394b7f7b25
[mips*/loongson-2f] video: Re-add and enable sm7xxfb driver, removed upstream in 3.15
...
svn path=/dists/trunk/linux/; revision=21775
2014-09-07 20:39:29 +00:00
Ben Hutchings
84a0830f61
sound: Disable SND_CS5535AUDIO on all but i386 and mips*/loongson-2f
...
Its config dependencies are now X86_32 || MIPS || COMPILE_TEST.
On MIPS, only Loongson 2F platforms use the CS5536 chip.
svn path=/dists/trunk/linux/; revision=21774
2014-09-07 19:04:02 +00:00
Ben Hutchings
efd5c33160
Don't try to enable CS5530 drivers on anything except i386
...
These config symbols now depend on X86_32 || COMPILE_TEST, so move
them into the appropriate config file.
svn path=/dists/trunk/linux/; revision=21773
2014-09-07 19:01:09 +00:00
Ben Hutchings
caf5baf65d
Move various i386-dependent config symbols into the appropriate config file
...
These now all have dependencies on X86_32 || COMPILE_TEST, so they
cannot be enabled on amd64.
Also remove the explicit disabling of these symbols at the top level.
svn path=/dists/trunk/linux/; revision=21772
2014-09-07 18:50:43 +00:00
Ben Hutchings
7fb242322b
Don't try to enable drivers for platforms we don't support
...
Various driver config symbols have new dependencies on platform
config symbols that we don't and aren't likely to enable.
svn path=/dists/trunk/linux/; revision=21771
2014-09-07 18:28:43 +00:00
Ben Hutchings
c0a5828ab2
[i386] comedi: Enable COMEDI_DAC02 as module, replacing COMEDI_POC
...
svn path=/dists/trunk/linux/; revision=21770
2014-09-07 16:56:57 +00:00
Ben Hutchings
5dea0d3a05
[armhf] Re-enable SPI_IMX as module
...
svn path=/dists/trunk/linux/; revision=21769
2014-09-07 16:46:18 +00:00
Ben Hutchings
f53ac440e5
[m68k] Enable CGROUPS, required by systemd
...
svn path=/dists/trunk/linux/; revision=21768
2014-09-07 16:02:50 +00:00
Ben Hutchings
15896ca3a3
mtd: Enable MTD_SPI_NOR as module, since M25P80 now depends on it
...
svn path=/dists/trunk/linux/; revision=21767
2014-09-07 15:57:56 +00:00
Ben Hutchings
0a581348dc
hid-sony: Enable SONY_FF ( Closes : #760684 )
...
svn path=/dists/trunk/linux/; revision=21766
2014-09-07 03:40:09 +00:00
Ben Hutchings
4d466db044
Disabling UAS also closes #755995
...
svn path=/dists/trunk/linux/; revision=21765
2014-09-07 03:02:30 +00:00
Ben Hutchings
7e30b27c6d
sound/firewire: Enable SND_DICE, SND_FIREWORKS, SND_BEBOB as modules ( Closes : #756842 )
...
svn path=/dists/trunk/linux/; revision=21764
2014-09-07 02:59:59 +00:00
Ben Hutchings
9852c42848
Drop bug fix that was included in 3.16.2
...
svn path=/dists/trunk/linux/; revision=21763
2014-09-07 02:58:39 +00:00
Ben Hutchings
132c1763b5
virtio-scsi: Implement change_queue_depth for virtscsi targets ( Closes : #760324 )
...
svn path=/dists/trunk/linux/; revision=21762
2014-09-07 02:52:06 +00:00
Maximilian Attems
08f562c3dc
changelog: 3.16.2 is out
...
Signed-off-by: maximilian attems <maks@debian.org>
svn path=/dists/trunk/linux/; revision=21761
2014-09-06 13:29:35 +00:00
Aurelien Jarno
b1a41a45b1
[ppc64el] debian/patches/debian/ppc64el-disable-zImage.patch: remove patch.
...
The 'powerpc/boot: 64bit little endian wrapper' patch-set is in linux 3.16,
thus the default make/image-y target is OK now.
svn path=/dists/trunk/linux/; revision=21760
2014-09-02 21:54:43 +00:00
Ian Campbell
b8c4b589a2
[armel/kirkwood] Enable CONFIG_MTD_SPI_NOR for flash access.
...
svn path=/dists/trunk/linux/; revision=21759
2014-09-02 16:10:36 +00:00
Aurelien Jarno
97ad3c8126
[powerpc,ppc64el] Backport KVM little endian support from 3.17.
...
svn path=/dists/trunk/linux/; revision=21758
2014-09-01 19:34:44 +00:00
Ian Campbell
94dceabe7a
[armhf] Add link to ARMMP kernel info wiki page
...
svn path=/dists/trunk/linux/; revision=21757
2014-08-30 20:28:09 +00:00
Ian Campbell
89658d2446
[armhf] Remove incomplete list of hardware from image description
...
svn path=/dists/trunk/linux/; revision=21756
2014-08-30 20:28:04 +00:00
Maximilian Attems
c16be3aebf
redisable UAS, still not ready for prime time..
...
Signed-off-by: maximilian attems <maks@debian.org>
svn path=/dists/trunk/linux/; revision=21755
2014-08-30 08:25:40 +00:00
Aurelien Jarno
c89efe2368
Revert r21750, as vmlinuz support for ppc64el is not ready for all bootloaders yet
...
svn path=/dists/trunk/linux/; revision=21754
2014-08-29 21:48:57 +00:00
Ben Hutchings
c9e2ac6cae
[armel] Remove obsolete mv78xx0 flavour
...
svn path=/dists/trunk/linux/; revision=21753
2014-08-29 21:41:18 +00:00
Ben Hutchings
bc902f4520
[x86] mgag200: Enable auto-loading, but require mode-setting to be explicitly enabled
...
xserver-xorg-video-modesetting installs a modprobe config file to enable
mode-setting in cirrusy and mgag200.
Also update the description of the cirrus patch to reflect the current
status.
svn path=/dists/trunk/linux/; revision=21752
2014-08-27 23:24:58 +00:00
Ben Hutchings
c692bc729d
mm: Enable FRONTSWAP, ZSWAP (except armel/{ixp4xx,orion5x}) ( Closes : #725703 )
...
svn path=/dists/trunk/linux/; revision=21751
2014-08-27 07:51:46 +00:00
Aurelien Jarno
8364adfe25
* [ppc64el] debian/config/ppc64el/defines: switch to vmlinuz (from vmlinux).
...
* [ppc64el] debian/patches/debian/ppc64el-disable-zImage.patch: remove patch.
The 'powerpc/boot: 64bit little endian wrapper' patch-set is in linux 3.16.
(Closes : #759389 ).
svn path=/dists/trunk/linux/; revision=21750
2014-08-27 07:41:59 +00:00
Ben Hutchings
24876894ca
aio: fix reqs_available handling (regression in 3.14.10)
...
svn path=/dists/trunk/linux/; revision=21749
2014-08-27 06:48:09 +00:00
Ben Hutchings
b07b6247e4
[powerpc] drm: Disable DRM_RADEON_UMS, as radeon X driver now requires KMS
...
svn path=/dists/trunk/linux/; revision=21746
2014-08-25 07:13:30 +00:00
Ben Hutchings
ea0eb9843d
[armel/kirkwood] ftrace: Disable some tracers to make the kernel image fit
...
svn path=/dists/trunk/linux/; revision=21745
2014-08-25 06:41:10 +00:00
Ben Hutchings
072a14449f
ftrace: Enable FUNCTION_TRACER, FUNCTION_GRAPH_TRACER, FTRACE_SYSCALLS, STACK_TRACER and DYNAMIC_FTRACE ( Closes : #563847 , #758469 )
...
svn path=/dists/trunk/linux/; revision=21744
2014-08-25 03:23:32 +00:00
Ben Hutchings
edbecf46f8
[armhf,arm64] udeb: Add efi-modules
...
svn path=/dists/trunk/linux/; revision=21743
2014-08-24 21:27:25 +00:00
Aurelien Jarno
c35b794371
Group patches
...
svn path=/dists/trunk/linux/; revision=21742
2014-08-24 18:45:44 +00:00
Aurelien Jarno
5e776bb276
[mips*/loongson3] Backport Loongson 3B support from 3.17.
...
svn path=/dists/trunk/linux/; revision=21741
2014-08-24 18:45:12 +00:00
Ben Hutchings
40f62fa5c0
Change version and ABI name for upload to sid
...
svn path=/dists/trunk/linux/; revision=21739
2014-08-24 00:52:27 +00:00
Ben Hutchings
7e180f1530
Merge pending changes from sid
...
svn path=/dists/trunk/linux/; revision=21736
2014-08-24 00:45:55 +00:00
Aurelien Jarno
ce1e515eb4
Update Spanish debconf template translations (Matias A. Bellone)
...
(Closes : #758591 ).
svn path=/dists/sid/linux/; revision=21732
2014-08-19 18:17:28 +00:00
Maximilian Attems
f8f483034a
changelog add bug closure
...
Signed-off-by: maximilian attems <maks@debian.org>
svn path=/dists/trunk/linux/; revision=21731
2014-08-14 20:54:26 +00:00
Maximilian Attems
a737297fea
changelog update to 3.16.1
...
todo: change from exp (trunk) to sid.
Signed-off-by: maximilian attems <maks@debian.org>
svn path=/dists/trunk/linux/; revision=21730
2014-08-14 06:35:00 +00:00
Maximilian Attems
f701e00b53
armmp: enable new IMX_IPUV3_CORE
...
moved from staging and renamed from DRM_IMX_IPUV3_CORE.
Signed-off-by: maximilian attems <maks@debian.org>
svn path=/dists/trunk/linux/; revision=21726
2014-08-12 09:16:45 +00:00
Ben Hutchings
c43f57304a
HID: Enable HID_RMI as module ( Closes : #754519 )
...
svn path=/dists/trunk/linux/; revision=21725
2014-08-12 01:59:50 +00:00
Ben Hutchings
7659165f57
Update handling of experimental versions in stable-update.sh
...
We abbreviated the suffix for experimental Debian revisions from
'~experimental.' to '~exp' a while back.
svn path=/dists/sid/linux/; revision=21724
2014-08-10 19:42:51 +00:00
Aurelien Jarno
f3f70bfebc
* [mips*] Fix FP emulation for unaligned accesses.
...
svn path=/dists/sid/linux/; revision=21723
2014-08-10 12:39:26 +00:00
Ben Hutchings
c1092ba7f5
Prepare to release linux (3.16-1~exp1).
...
svn path=/dists/trunk/linux/; revision=21722
2014-08-09 22:52:54 +00:00