ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-25 08:21:14 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
25,052 Commits 9 Branches 76 Tags 921 MiB
968ed2e58a
Commit Graph

438 Commits

Author SHA1 Message Date
Gabor Juhos
c19c30cefd kernel: update linux 3.7 to 3.7.2 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35100
 2013-01-12 11:43:08 +00:00
Felix Fietkau
741f6ba7ef x86: fix typo in alix2/net5501 default packages 
SVN-Revision: 34972
 2013-01-02 16:09:23 +00:00
Mirko Vogt
4d4b2d3ced merge /lib/functions/boot.sh and /lib/functions.sh 
SVN-Revision: 34794
 2012-12-19 16:07:53 +00:00
Mirko Vogt
439a869090 Do not overload mount-call - trying to reduce confusion 
The behaviour of calling 'mount' differed depending on whether it called
the busybox-mount, the mount of util-linux, the mount defined in
/lib/functions.sh and /lib/functions/boot.sh

/etc/preinit even included /lib/functions.sh and /lib/functions/boot.sh,
both re-defining 'mount'.

SVN-Revision: 34792
 2012-12-19 16:07:46 +00:00
Gabor Juhos
029553b698 refresh kernel configs with kconfig.pl 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34763
 2012-12-18 15:54:15 +00:00
Gabor Juhos
7ff7340304 geos: add missing config-3.7 file 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34762
 2012-12-18 15:51:45 +00:00
Gabor Juhos
8903f8581b kernel: update linux 3.7 to 3.7.1 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34760
 2012-12-18 15:13:31 +00:00
Gabor Juhos
5a680f1cbf geos: update to 3.7 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34755
 2012-12-18 14:50:48 +00:00
Gabor Juhos
9b15d3e22a kernel: add 3.7 support for x86 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34754
 2012-12-18 14:50:47 +00:00
Gabor Juhos
44b9898251 kernel: update linux 3.6 to 3.6.11 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34748
 2012-12-18 14:41:16 +00:00
Gabor Juhos
2b378d11c8 kernel: update linux 3.6 to 3.6.10 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34639
 2012-12-11 20:14:39 +00:00
Gabor Juhos
2581173660 kernel: update linux 3.6 to 3.6.9 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34578
 2012-12-08 15:01:33 +00:00
Florian Fainelli
33f6c5ddb9 kernel: add missing USB configuration symbols after r34501 
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34568
 2012-12-07 11:01:53 +00:00
Gabor Juhos
ea17e36482 kernel: Update Geos to 3.6.8 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34411
 2012-11-29 17:37:19 +00:00
Gabor Juhos
1f516235ea remove common symbols from 3.3 configs 
The removed symbols are present in the generic configuration.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34403
 2012-11-29 15:21:35 +00:00
Jo-Philipp Wich
298a8e2300 x86/generic: don't disable usbfs (#12452) 
SVN-Revision: 34139
 2012-11-10 23:28:58 +00:00
Felix Fietkau
46288bf98e x86: use $(strip) for the at_keyboard check 
SVN-Revision: 34127
 2012-11-09 10:53:36 +00:00
Felix Fietkau
0a9e05fb0e x86: only enable at_keyboard for the generic and kvm_guest subtargets to avoid hangs on alix2 and others (thx, russell) 
SVN-Revision: 34126
 2012-11-09 10:19:51 +00:00
Jo-Philipp Wich
f600ec5b3b x86: allow both old and new grub signatures in sysupgrade 
SVN-Revision: 33898
 2012-10-23 16:34:00 +00:00
Felix Fietkau
95e642632a x86: correct image magic for grub2 images 
Sysupgrade broke on x86 when grub2 superceded grub.  This patch
corrects tha magic_word to be expected in grub2 combined images.

Signed-off-by: Russell Senior <russell@personaltelco.net>

SVN-Revision: 33890
 2012-10-22 16:06:29 +00:00
Florian Fainelli
60ecd5fe04 merge the RDC R-321x target as a subtarget of x86 
SVN-Revision: 33779
 2012-10-15 18:54:34 +00:00
Jo-Philipp Wich
4cfd3dc8ed x86/kvm_guest: enable PCIE support 
SVN-Revision: 33741
 2012-10-12 16:51:31 +00:00
Felix Fietkau
856fba88d9 x86: remove the reboot=bios command line parameter (#12193) 
SVN-Revision: 33671
 2012-10-09 15:20:11 +00:00
Felix Fietkau
1abbe676d1 x86: rename the iso file to openwrt-x86-generic.iso 
SVN-Revision: 33641
 2012-10-07 23:05:39 +00:00
Felix Fietkau
0dd7644ec7 x86: remove grub-legacy 
SVN-Revision: 33640
 2012-10-07 23:01:56 +00:00
Felix Fietkau
a1bcd25082 x86: add grub2 iso support 
SVN-Revision: 33639
 2012-10-07 23:01:52 +00:00
Felix Fietkau
53cc34e517 x86/generic: enable cdrom + iso9660 support 
SVN-Revision: 33638
 2012-10-07 23:01:47 +00:00
Felix Fietkau
493b7c7f3c x86: avoid using grub prepare when using grub2 
SVN-Revision: 33525
 2012-09-23 09:59:56 +00:00
Felix Fietkau
999252dccc x86-generic: enable a few more common kernel options/drivers 
SVN-Revision: 33516
 2012-09-22 23:29:20 +00:00
Felix Fietkau
0260262f0b x86: enable usb storage support for the generic subtarget to support booting from usb devices 
SVN-Revision: 33514
 2012-09-22 21:15:59 +00:00
Felix Fietkau
52e8ee0666 x86: add support for building grub2 images 
SVN-Revision: 33513
 2012-09-22 20:10:42 +00:00
Felix Fietkau
ce4244c8af x86: split generic image building into a separate script 
SVN-Revision: 33511
 2012-09-22 20:10:35 +00:00
Felix Fietkau
6c02dd2b04 x86: rename gen_image_x86.sh to gen_image_grub.sh 
SVN-Revision: 33510
 2012-09-22 20:10:31 +00:00
John Crispin
f186bff0ef add missing kvm_guest kernel options 
SVN-Revision: 33319
 2012-09-05 19:38:42 +00:00
John Crispin
76954dc8b0 set xen images to gzip compression, fixes #11970 
SVN-Revision: 33192
 2012-08-15 09:20:12 +00:00
Jo-Philipp Wich
c8a0166212 Fix hard reset of alix/soekris hardware under heavy NIC load 
The following patch corrects a hard reset that occurs on alix and
soekris net5501 hardware. Specifically, this is an issue with the via
rhine NIC driver. Under periods of extreme load, the via rhine driver
can cause a reset of the entire system. When this happens no output is
seen on the console, the device simply reboots. This was reported in the
following ticket:

Consistent crash on Soekris NET5501
https://dev.openwrt.org/ticket/11882

I was able to reproduce the problem locally with numerous alix 2d13
platforms. Under heavy 64 byte frame size load from a Smartbits traffic
generator, the alix hardware will hard reset in under 5 minutes. The
same hardware, under the same load, on FreeBSD 9.0 does not reset.

The patch below backports most of the via rhine changes from kernel 3.5.
With OpenWrt trunk being on kernel 3.3.8, it seemed prudent to bring
these changes in to avoid this serious issue.

I've tested this heavily in my test environment and was able to keep the
device stable under load for extended periods of time without any resets.

Also, a nice side effect of this change is that it significantly raises
the performance the platform. Without this patch the alix 2d13 can move
approximately 29,000 packets per second at 64 byte frame sizes. After
this patch the alix can move 52,000 packets per second at 64 byte frame
sizes.

I put this patch under the x86 patches as those are the only platforms
with via rhine hardware that I'm aware of. If it needs to go some place
else please let me know.

Thanks,
Adam

Signed-off-by: Adam Gensler <openwrt@kristenandadam.net>

SVN-Revision: 33072
 2012-08-09 09:41:22 +00:00
Florian Fainelli
d359d46182 make kmod-fb dependent on DISPLAY_SUPPORT and update targets accordingly 
SVN-Revision: 32869
 2012-07-25 19:36:19 +00:00
Florian Fainelli
c3b9a987b7 move leds modules back to target modules.mk 
SVN-Revision: 32851
 2012-07-25 15:49:57 +00:00
Florian Fainelli
bca45d6d8a move i2c modules back to target modules.mk 
SVN-Revision: 32850
 2012-07-25 15:49:54 +00:00
Florian Fainelli
2bfb2a797c move more x86-specific modules back to target modules.mk 
SVN-Revision: 32848
 2012-07-25 15:49:49 +00:00
Florian Fainelli
d973768580 move x86 specific ide/pata modules to x86' modules.mk 
SVN-Revision: 32846
 2012-07-25 15:49:42 +00:00
Vasilis Tsiligiannis
1978c07539 Fix sysupgrade for squashfs, jffs2 and ext4 images 
* use 'fsync' with 'dd' for image writing
	* save config to boot partition

SVN-Revision: 32465
 2012-06-19 22:36:53 +00:00
Jo-Philipp Wich
f06473f8ff optimize kernel config for kvm_guest 
This patch enables few extra kernel options for the kvm_guest subtarget:
- Tickless kernel to avoid timer ticks in idle guests, reduces CPU usage
- Enable paravirtualization steal time support

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

SVN-Revision: 32436
 2012-06-18 23:36:50 +00:00
Jo-Philipp Wich
cbac321164 remove inittab override 
SVN-Revision: 32422
 2012-06-18 11:50:37 +00:00
Jo-Philipp Wich
e3663ff907 use ttyS0 @ 115200 baud as default for KVM guests 
SVN-Revision: 32384
 2012-06-15 12:59:49 +00:00
John Crispin
a4d96aae8d bump to 3.3.8 
SVN-Revision: 32055
 2012-06-05 06:57:51 +00:00
Gabor Juhos
2ae5581447 kernel: update linux 3.3 to 3.3.7 
SVN-Revision: 31848
 2012-05-23 21:05:32 +00:00
Gabor Juhos
07b5a3eea2 x86: remove support for old kernels 
SVN-Revision: 31804
 2012-05-18 20:10:42 +00:00
Gabor Juhos
604e3aac0a x86: remove subtarget specific LINUX_VERSION overrides 
SVN-Revision: 31803
 2012-05-18 20:10:38 +00:00
Gabor Juhos
d9dab97d38 x86/ep80579: switch to 3.3 
Also fix build errors in the ep80579-drivers package.
Compile tested only.

SVN-Revision: 31802
 2012-05-18 20:10:33 +00:00
Gabor Juhos
a5de52c244 x86/olpc: switch to 3.3 
Compile tested only.

SVN-Revision: 31784
 2012-05-18 09:57:32 +00:00
Gabor Juhos
9e54e012d6 x86: image: select bootscript images by default for OLPC 
SVN-Revision: 31783
 2012-05-18 09:57:29 +00:00
Gabor Juhos
562e468ae5 x86/thincan: switch to 3.3 
Compile tested only.

SVN-Revision: 31765
 2012-05-17 06:41:01 +00:00
Gabor Juhos
1f7f8376a6 x86/xen_domu: switch to 3.3 
Compile tested only.

SVN-Revision: 31764
 2012-05-17 06:41:00 +00:00
Gabor Juhos
8bb7ddecfd x86/kvm_guest: switch to 3.3 
Compile tested only.

SVN-Revision: 31763
 2012-05-17 06:40:58 +00:00
Gabor Juhos
f14d1a588d x86/generic: switch to 3.3 
Compile tested only.

SVN-Revision: 31762
 2012-05-17 06:40:56 +00:00
Gabor Juhos
eb2fe5e863 x86/alix2: switch to 3.3 
Compile tested only.

SVN-Revision: 31753
 2012-05-16 10:45:02 +00:00
Gabor Juhos
fb7da5bbde x86/net5501: switch to 3.3 
Compile tested only.

SVN-Revision: 31752
 2012-05-16 10:44:59 +00:00
Gabor Juhos
9e049ce25c x86: sync 3.3 configs 
SVN-Revision: 31751
 2012-05-16 10:44:55 +00:00
Gabor Juhos
19f691f8e4 x86: sync 3.2 configs 
SVN-Revision: 31750
 2012-05-16 10:44:52 +00:00
Gabor Juhos
724fd5e657 x86: sync 2.6.39 configs 
SVN-Revision: 31749
 2012-05-16 10:44:49 +00:00
Gabor Juhos
39994008cb linux: move certain disabled symbols to the generic configs 
* CONFIG_ARCH_DMA_ADDR_T_64BIT
  * CONFIG_ARCH_HAS_ILOG2_U32
  * CONFIG_ARCH_HAS_ILOG2_U64
  * CONFIG_ARCH_PHYS_ADDR_T_64BIT
  * CONFIG_ARCH_SUPPORTS_MSI
  * CONFIG_GENERIC_CPU_DEVICES
  * CONFIG_HWMON_DEBUG_CHIP
  * CONFIG_I2C_PXA_PCI
  * CONFIG_LEDS_GPIO
  * CONFIG_MINIX_FS_NATIVE_ENDIAN
  * CONFIG_MLX4_CORE
  * CONFIG_POWER_SUPPLY
  * CONFIG_POWER_SUPPLY_DEBUG
  * CONFIG_QUOTACTL
  * CONFIG_SDIO_UART
  * CONFIG_SENSORS_K10TEMP
  * CONFIG_SENSORS_SCH56XX_COMMON
  * CONFIG_SENSORS_VIA_CPUTEMP
  * CONFIG_SERIO_AMBAKMI
  * CONFIG_SERIO_I8042
  * CONFIG_SERIO_LIBPS2
  * CONFIG_SERIO_PCIPS2
  * CONFIG_SERIO_RAW
  * CONFIG_SERIO_SERPORT
  * CONFIG_SPI_BITBANG
  * CONFIG_SPI_GPIO

SVN-Revision: 31737
 2012-05-15 10:58:52 +00:00
Gabor Juhos
b472e5d12e kernel: update linux 3.3 to 3.3.6 
SVN-Revision: 31709
 2012-05-14 09:18:32 +00:00
Gabor Juhos
34018a630f kernel: update linux 3.3 to 3.3.5 
SVN-Revision: 31645
 2012-05-07 20:11:43 +00:00
Gabor Juhos
cbfce53831 kernel: update linux 3.3 to 3.3.4 
SVN-Revision: 31541
 2012-04-30 08:38:11 +00:00
Jonas Gorski
8fd383ae2e kernel: update linux 3.3 to 3.3.3 
SVN-Revision: 31460
 2012-04-24 09:25:38 +00:00
Jonas Gorski
22b4e6b882 kernel: update linux 3.2 to 3.2.16 
SVN-Revision: 31459
 2012-04-24 09:25:35 +00:00
Gabor Juhos
4b6833b176 x86: restore config-default, it is needed for 2.6.39 
Reported-by: Thomas Heil <heil@terminal-consulting.de>

SVN-Revision: 31452
 2012-04-23 16:56:08 +00:00
Gabor Juhos
f63d216467 x86: remove 2.6.32 support 
SVN-Revision: 31415
 2012-04-21 16:17:48 +00:00
Jonas Gorski
d0bfc67e2e kernel: x86: also update subtarget kernel versions 
SVN-Revision: 31338
 2012-04-17 21:01:43 +00:00
Jo-Philipp Wich
a0f0213462 bump to Linux v3.3.1 
SVN-Revision: 31314
 2012-04-16 15:04:47 +00:00
Jo-Philipp Wich
4b230e19fc PATCH: Disable console terminal in Grub for alix2 target 
The alix2 target has the VGA console for grub enabled by default. This
prevents the grub menu from appearing on bootup. It is disabled by
default for the other embedded x86 platforms. This patch corrects that
behavior for the alix2 target.

Signed-off-by: Adam Gensler <openwrt@kristenandadam.net>

SVN-Revision: 31270
 2012-04-12 23:30:27 +00:00
Jo-Philipp Wich
fcfdbd4961 add missing Kernel symbol spotted by buildbot 
SVN-Revision: 31232
 2012-04-10 10:09:27 +00:00
Jonas Gorski
16b4cbcdd6 kernel: update linux 3.2 to 3.2.14 
SVN-Revision: 31222
 2012-04-09 14:48:51 +00:00
Florian Fainelli
60e195d399 geos: add 'tc' and kmod-sched for bonding 
The Geos2 includes 2 ADSL+ interfaces, and as such it needs to have the TEQL scheduler for bonding.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

SVN-Revision: 31094
 2012-03-27 17:47:37 +00:00
Jens Muecke
1d2b19c4bf Disable keyboard for x86 default config - revoke patch 30966 
This was already fixed by commit 30309 and is part of generic x86 target.

SVN-Revision: 31052
 2012-03-21 19:10:02 +00:00
Jo-Philipp Wich
884f964e62 alix2: add require crypto kmods (#10410) 
SVN-Revision: 30980
 2012-03-18 18:56:02 +00:00
Jens Muecke
deac1c16a1 Enable keyboard for x86 
This is required for qemu like descripted in
here http://wiki.openwrt.org/doc/howto/qemu

SVN-Revision: 30966
 2012-03-17 21:32:08 +00:00
Jo-Philipp Wich
bafdae9233 enable RTC_CLASS for Linux 3.2 and 3.3 
SVN-Revision: 30717
 2012-02-25 13:06:26 +00:00
Jo-Philipp Wich
74db55a982 config: deprecated symbol CONFIG_LEDS_GPIO_PLATFORM 
CONFIG_LEDS_GPIO_PLATFORM went away a while ago.

http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commit;h=2bcc7ed5b83b0a59c6976476e8788675038fb11b

Also, most platforms comment out CONFIG_LEDS_GPIO but not x86 for some reason.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

SVN-Revision: 30708
 2012-02-24 10:35:20 +00:00
Vasilis Tsiligiannis
eed8e2a4fd Disable by default padding of images 
SVN-Revision: 30590
 2012-02-16 17:54:07 +00:00
Vasilis Tsiligiannis
8676e49d9d Allow gzipping of squashfs images with padded jffs2 partition 
SVN-Revision: 30589
 2012-02-16 17:54:04 +00:00
Vasilis Tsiligiannis
ab09db09fc GZip only ext4 and padded images 
SVN-Revision: 30588
 2012-02-16 17:54:01 +00:00
Vasilis Tsiligiannis
b4f51343c6 Make gzipping of images configurable via menuconfig 
SVN-Revision: 30587
 2012-02-16 17:53:57 +00:00
Jo-Philipp Wich
f35c4a3266 8139cp: backport patches to make driver stable again 
List of patches that Jo-Philipp groveled out of git.

Redux: defuzzed.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

SVN-Revision: 30366
 2012-02-07 21:56:51 +00:00
Vasilis Tsiligiannis
834be6c1fe alix2, geos: Adjust CFLAGS 
Clone of CFLAGS change from r30013 into Geos and Alix platforms.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

SVN-Revision: 30353
 2012-02-07 13:00:47 +00:00
Vasilis Tsiligiannis
42ec97097e generic: Enable HPET, HID and AT keyboard support 
SVN-Revision: 30309
 2012-02-05 17:56:04 +00:00
Vasilis Tsiligiannis
b5ff8b85d6 generic: Add missing and remove unused config symbols 
SVN-Revision: 30133
 2012-02-04 20:45:17 +00:00
Jonas Gorski
d6afe712ab x86: make alix platform patch apply to 3.3 
Based on a patch from Philip Prindeville.

While at it, also refresh the patches.

SVN-Revision: 30025
 2012-02-03 20:17:00 +00:00
Jo-Philipp Wich
c433bfb571 disable additional PATA drivers in global 3.2 and 3.3 config, remove redundant symbols from alix2 config 
SVN-Revision: 30024
 2012-02-03 19:47:55 +00:00
Jo-Philipp Wich
40867f1b68 x86: trivial -- add missing CONFIG_GEOS symbol to top-level So that builds don't stall in x86 prompting for this symbol. [From Philip Prindeville, via http://patchwork.openwrt.org/patch/1828/] 
SVN-Revision: 30023
 2012-02-03 19:21:41 +00:00
Jo-Philipp Wich
79a3fdb9da geos: backport driver from linux-next to 3.2 and 3.3 The Geos driver is in linux-next and will be out in 3.4. It builds fine against 3.2.2 and 3.3-rc2. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> 
SVN-Revision: 30022
 2012-02-03 18:16:27 +00:00
Jo-Philipp Wich
25d605ab0e net5501: backport drivers from linux-next Backport net5501 platform driver from 3.4. Remove vestiges of old (pre-2.6.30) leds-net5501.c driver. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> 
SVN-Revision: 30021
 2012-02-03 18:14:02 +00:00
Jo-Philipp Wich
7a36f3d2ff x86: move additional oddball PATA drivers These should only be enabled in the generic image, as they bloat all of the other targets. Also add symbols for NET5501, ALIX, and GEOS which were added backported to 3.2 and 3.3. Restore PC speaker to Geos target. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> 
SVN-Revision: 30019
 2012-02-03 18:02:57 +00:00
Jo-Philipp Wich
d13c3cd073 net5501: adjust CFLAGS and package selection (#10893) This patches the CFLAGS for Geode LX CPUs for 4.3 and new GGC versions. This creates more compatible code and allowed me to boot my system first time with no troubles. Also, the missing kmod is added in. 
SVN-Revision: 30013
 2012-02-03 14:19:29 +00:00
Jonas Gorski
f99bf6517c x86: add 3.3 generic symbols 
Copy x86/config-3.2 to x86/config-3.3 and add additional symbols (for 3.3-rc2).

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

SVN-Revision: 30002
 2012-02-02 21:01:59 +00:00
Jo-Philipp Wich
b6be49429b alix2: backport platform driver updates from linux-next Add patches to x86/patches-3.2 and x86/patches-3.3 (update will appear in 3.4). [Patch from Philipp Prindeville, via http://patchwork.openwrt.org/patch/1817/] 
SVN-Revision: 30001
 2012-02-02 19:26:32 +00:00
Jo-Philipp Wich
7a9e4ffe8e alix2, geos, net5501: remove kmod-ledtrig-netfilter, its not used by any standard system facility 
SVN-Revision: 30000
 2012-02-02 19:11:52 +00:00
Jo-Philipp Wich
bf8bb9b661 alix2, goes, net5501: clean up default packages Remove packages which are dependencies of other packages Remove packages which are part of the default package list Remove DSL specific packages from net5501 Remove bridge package, we use the busybox applet Replace hostapd with wpad 
SVN-Revision: 29999
 2012-02-02 19:06:22 +00:00
Jo-Philipp Wich
047ba1e12e alix2, net5501: bump both subtargets to Linux 3.2.2 to align with the rest 
SVN-Revision: 29998
 2012-02-02 19:00:40 +00:00