Steven Barth [Thu, 30 May 2013 15:46:12 +0000 (15:46 +0000)]
AA: netifd: backport r36771
SVN-Revision: 36774
Steven Barth [Thu, 30 May 2013 15:46:07 +0000 (15:46 +0000)]
AA: 6relayd: backport r36772
SVN-Revision: 36773
Jonas Gorski [Thu, 30 May 2013 10:50:58 +0000 (10:50 +0000)]
AA: uml: remove obsolete patch breaking compilation
This is now handled by a generic, more complete patch.
Reported-by: Markus Stenberg <markus.stenberg@iki.fi>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36769
Felix Fietkau [Thu, 30 May 2013 10:46:33 +0000 (10:46 +0000)]
ubus: backport latest version from trunk
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36768
Steven Barth [Thu, 30 May 2013 07:57:58 +0000 (07:57 +0000)]
AA: 6relayd: backport r36764
SVN-Revision: 36765
Steven Barth [Tue, 28 May 2013 18:33:00 +0000 (18:33 +0000)]
AA: netifd: backport r36748
SVN-Revision: 36749
Steven Barth [Tue, 28 May 2013 16:29:39 +0000 (16:29 +0000)]
AA: odhcp6c: backport r36745
SVN-Revision: 36746
Steven Barth [Mon, 27 May 2013 20:41:17 +0000 (20:41 +0000)]
AA: backport r36738
SVN-Revision: 36739
Jo-Philipp Wich [Mon, 27 May 2013 15:17:45 +0000 (15:17 +0000)]
AA: backport firewall3 package from trunk
SVN-Revision: 36737
Steven Barth [Mon, 27 May 2013 12:54:24 +0000 (12:54 +0000)]
AA: ipv6-support: align default ip6assign with trunk
SVN-Revision: 36735
Steven Barth [Mon, 27 May 2013 12:26:10 +0000 (12:26 +0000)]
AA: Update ipv6-support migration path
SVN-Revision: 36734
Steven Barth [Mon, 27 May 2013 11:21:02 +0000 (11:21 +0000)]
AA: netifd: remove deprecated IPv6 sysctls
SVN-Revision: 36733
Steven Barth [Mon, 27 May 2013 11:20:54 +0000 (11:20 +0000)]
AA: base-files: merge new sysctl-behaviour from trunk
SVN-Revision: 36732
Jo-Philipp Wich [Sun, 26 May 2013 17:31:04 +0000 (17:31 +0000)]
AA: uci: merge r36730
SVN-Revision: 36731
Steven Barth [Sun, 26 May 2013 11:29:31 +0000 (11:29 +0000)]
AA: backport r36623
SVN-Revision: 36720
Steven Barth [Sun, 26 May 2013 10:09:41 +0000 (10:09 +0000)]
AA: backport r36719
SVN-Revision: 36719
Steven Barth [Fri, 24 May 2013 15:11:24 +0000 (15:11 +0000)]
AA: backport r36655 from trunk
SVN-Revision: 36715
Felix Fietkau [Fri, 24 May 2013 13:14:26 +0000 (13:14 +0000)]
AA: backport ubus from trunk
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36714
Steven Barth [Fri, 24 May 2013 13:03:59 +0000 (13:03 +0000)]
AA: add ipv6-support for transitioning between IPv6-stacks
SVN-Revision: 36712
Steven Barth [Fri, 24 May 2013 13:03:55 +0000 (13:03 +0000)]
AA: backport 6relayd from trunk
SVN-Revision: 36711
Steven Barth [Fri, 24 May 2013 13:03:50 +0000 (13:03 +0000)]
AA: backport odhcp6c from trunk
SVN-Revision: 36710
Steven Barth [Fri, 24 May 2013 13:03:45 +0000 (13:03 +0000)]
AA: backport ds-lite from trunk
SVN-Revision: 36709
Steven Barth [Fri, 24 May 2013 13:03:41 +0000 (13:03 +0000)]
AA: backport 6to4 from trunk
SVN-Revision: 36708
Steven Barth [Fri, 24 May 2013 13:03:36 +0000 (13:03 +0000)]
AA: backport 6rd from trunk
SVN-Revision: 36707
Steven Barth [Fri, 24 May 2013 13:03:32 +0000 (13:03 +0000)]
AA: backport 6in4 from trunk
SVN-Revision: 36706
Steven Barth [Fri, 24 May 2013 13:03:26 +0000 (13:03 +0000)]
AA: backport netifd from trunk
SVN-Revision: 36705
Steven Barth [Fri, 24 May 2013 13:03:21 +0000 (13:03 +0000)]
AA: backport libubox from trunk
SVN-Revision: 36704
Steven Barth [Fri, 24 May 2013 12:17:44 +0000 (12:17 +0000)]
AA: backport r34389 to fix grub2 compilation
SVN-Revision: 36701
Steven Barth [Fri, 24 May 2013 12:17:38 +0000 (12:17 +0000)]
AA: allow ipv6 policy routing rules to select output traffic
SVN-Revision: 36700
Felix Fietkau [Tue, 21 May 2013 11:56:27 +0000 (11:56 +0000)]
hostapd: sync with trunk r36533
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36682
Jonas Gorski [Mon, 20 May 2013 12:14:30 +0000 (12:14 +0000)]
AA: brcm2708: reduce dl size and make rev 2 raspis work
Backport of r36667, r36668.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36669
Felix Fietkau [Sun, 19 May 2013 22:49:09 +0000 (22:49 +0000)]
ar71xx: add an external reset callback for ar913x and use it in ath9k
should reduce the frequency of DMA stop failures
Backport of r36530
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36664
Felix Fietkau [Fri, 17 May 2013 14:19:36 +0000 (14:19 +0000)]
cmake.mk: add support for overriding the source dir, and define the cmake prefix path to avoid picking up host libraries for target builds (patch by Henning Rogge)
Backport of r34914
SVN-Revision: 36652
Jonas Gorski [Sun, 12 May 2013 10:55:58 +0000 (10:55 +0000)]
AA: kernel: fix CVE-2013-1763
Backport of r36607.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36608
Felix Fietkau [Thu, 9 May 2013 22:11:55 +0000 (22:11 +0000)]
iw: sync with latest nl80211 header
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36599
Jonas Gorski [Thu, 9 May 2013 20:53:59 +0000 (20:53 +0000)]
AA: kernel: modules: kmod-fs-isofs depends on kmod-lib-zlib
Backport of r36593.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36598
Jonas Gorski [Thu, 9 May 2013 20:53:56 +0000 (20:53 +0000)]
AA: kernel: make zlib and lzo modules selectable
Backport of r36592.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36597
Jo-Philipp Wich [Mon, 6 May 2013 12:26:03 +0000 (12:26 +0000)]
AA: ramips: add support for DIR-620D1
Both DIR-615H1 and DIR-620D1 are ralink rt3352 based router. But DIR-620D1 have 8MB flash and USB port.
Signed-off-by: Serge Vasilugin <vasilugin@yandex.ru>
SVN-Revision: 36557
Jo-Philipp Wich [Fri, 3 May 2013 12:55:42 +0000 (12:55 +0000)]
AA: feeds: use openwrt-routing feed
SVN-Revision: 36535
Jonas Gorski [Thu, 2 May 2013 15:31:02 +0000 (15:31 +0000)]
AA: bcm63xx: fix/enable livebox minipci
Enable the livebox-1 minipci, otherwise, the board won't detect
any device connected on it (included wifi cards).
I've made a patch against current AA svn. I didn't notice this issue
earlier since I'm currently using CFE on this board. It's just a missed
line.
Signed-off-by: Daniel Gonzalez <dgcbueu@gmail.com>
SVN-Revision: 36528
Felix Fietkau [Thu, 2 May 2013 13:28:32 +0000 (13:28 +0000)]
mac80211: fix compile errors on platforms with power management enabled
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36520
Jo-Philipp Wich [Thu, 2 May 2013 12:41:14 +0000 (12:41 +0000)]
AA: uci: merge r36518
SVN-Revision: 36519
Felix Fietkau [Thu, 2 May 2013 12:39:47 +0000 (12:39 +0000)]
tools/mtools: disable iconv support, it breaks on some systems
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r36516
SVN-Revision: 36517
Jo-Philipp Wich [Thu, 2 May 2013 12:07:10 +0000 (12:07 +0000)]
AA: atheros: backport r36513
SVN-Revision: 36514
Jo-Philipp Wich [Thu, 2 May 2013 10:38:32 +0000 (10:38 +0000)]
Fix ARV4518PW wifi issue. AA/12.09-rc2.
This patch corrects an issue with the wifi for the ARV4518PW in Attitude Adjustment that involves the PCI bus configuration in this board. The bootlog shows: ath5k: phy0: failed to warm reset the MAC Chip.
Commenting this line forces the board definition to be configured with the default PCI_GNT1 | PCI_REQ1 defined in line 138.
The wifi and the usb have been deeply tested and they worked without problems. Maybe would be a good idea to make stress tests.
Once applied this ticket should be closed:
https://dev.openwrt.org/ticket/11704
Signed-off-by: José Vázquez Fernández <ppvazquezfer@gmail.com>
Signed-off-by: Daniel González <dgcbueu@gmail.com>
SVN-Revision: 36510
Jonas Gorski [Tue, 30 Apr 2013 11:56:54 +0000 (11:56 +0000)]
AA: toolchain: gcc: backport fixes for gcc bug 54295
Backport of r36486.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36500
Jo-Philipp Wich [Sun, 28 Apr 2013 14:05:57 +0000 (14:05 +0000)]
AA: iwinfo: merge r36471
SVN-Revision: 36472
Felix Fietkau [Sun, 28 Apr 2013 12:37:09 +0000 (12:37 +0000)]
mac80211: update to 2013-02-22 from trunk + backports
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36470
Jo-Philipp Wich [Sat, 27 Apr 2013 09:45:06 +0000 (09:45 +0000)]
AA: iwinfo: merge r34982, r35005, r35007, r35471, r36292, r36339, r36417, r36449, r36450
SVN-Revision: 36465
Jo-Philipp Wich [Sat, 27 Apr 2013 09:42:28 +0000 (09:42 +0000)]
AA: uci: merge r36377
SVN-Revision: 36464
Felix Fietkau [Thu, 25 Apr 2013 17:16:53 +0000 (17:16 +0000)]
build: fix one more instance of a stray -rc1
SVN-Revision: 36425
Jo-Philipp Wich [Thu, 25 Apr 2013 09:36:00 +0000 (09:36 +0000)]
AA: base-files: backport r36107
SVN-Revision: 36423
Jo-Philipp Wich [Thu, 25 Apr 2013 07:49:57 +0000 (07:49 +0000)]
attitude_adjustment: fix default opkg url in version.mk
SVN-Revision: 36421
Felix Fietkau [Wed, 24 Apr 2013 21:37:40 +0000 (21:37 +0000)]
attitude_adjustment: change default version number to 12.09 instead of -rc1
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36420
Felix Fietkau [Tue, 23 Apr 2013 16:34:08 +0000 (16:34 +0000)]
mac80211: use the original mac address for the first virtual interface
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r36408
SVN-Revision: 36409
Felix Fietkau [Wed, 17 Apr 2013 15:37:36 +0000 (15:37 +0000)]
mac80211: rework mac address allocation
If the first byte is available in the address mask, use only that one -
set the local bit and xor it with the id << 2. This ensures that there
are no hardware BSSID & BSSID-mask conflicts with devices that have
almost the same MAC address with just a small offset. The MAC address
conflict has been observed in a deployment with some devices from the
same batch when running with multiple interfaces.
If only some bits of the last byte are available, xor the id onto the
last MAC address byte (relevant mostly for Ralink devices).
In other cases (should not happen at this point), use the previous MAC
address offset calculation but without the local bit.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r36353
SVN-Revision: 36354
Florian Fainelli [Tue, 19 Mar 2013 13:36:32 +0000 (13:36 +0000)]
AA: backport openssl update from r35600
SVN-Revision: 36088
Felix Fietkau [Fri, 15 Mar 2013 22:24:36 +0000 (22:24 +0000)]
ath9k: add a fix to reduce the number of spurious tx hang detections
Backport of r36040
SVN-Revision: 36052
Felix Fietkau [Tue, 12 Mar 2013 00:25:14 +0000 (00:25 +0000)]
hostapd: fix client reassociation after too many ACK failures
Backport of r35973
SVN-Revision: 35974
Gabor Juhos [Mon, 11 Mar 2013 20:24:46 +0000 (20:24 +0000)]
AA: ar71xx: om2p-hs: use correct bit mask to disable JTAG functionality
Backport of r35966.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35968
Gabor Juhos [Mon, 11 Mar 2013 20:24:42 +0000 (20:24 +0000)]
AA: ar71xx: add AR934X_GPIO_FUNC_* defines
Backport of r35965.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35967
Hauke Mehrtens [Sun, 10 Mar 2013 20:31:07 +0000 (20:31 +0000)]
mac80211: backport of r35671: b43: Increase number of RX DMA slots
Bastian Bittorf reported that some of the silent freezes on a Linksys WRT54G
were due to overflow of the RX DMA ring buffer, which was created with 64
slots. That finding reminded me that I was seeing similar crashed on a netbook,
which also has a relatively slow processor. After increasing the number of
slots to 128, runs on the netbook that previously failed now worked; however,
I found that 109 slots had been used in one test. For that reason, the number
of slots is being increased to 256.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
SVN-Revision: 35947
Luka Perkov [Tue, 5 Mar 2013 14:48:35 +0000 (14:48 +0000)]
ar71xx: enable building ramdisk images for WZRHPG30XNH board types
Backport of r35874.
SVN-Revision: 35891
Gabor Juhos [Sun, 3 Mar 2013 17:30:12 +0000 (17:30 +0000)]
AA: hotplug2: restore accidentally deleted patch
Backport of r35863.
Without the 170-non_fatal_include.patch hotplug2 throws this:
Unable to include '/etc/hotplug2-platform.rules'
Syntax error (/etc/hotplug2-common.rules, line 9): Syntax error: Internal parser error.
Unable to include '/etc/hotplug2-common.rules'
Syntax error (/etc/hotplug2-init.rules, line 3): Syntax error: Internal parser error.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35864
Felix Fietkau [Sun, 3 Mar 2013 13:57:08 +0000 (13:57 +0000)]
hotplug2: fix a memory leak and wrong variables leaking into the fork worker process (#12436, maybe also #12765)
Backport of r35857
SVN-Revision: 35859
Felix Fietkau [Sun, 3 Mar 2013 13:57:07 +0000 (13:57 +0000)]
hotplug2: merge worker related fixes into one patch
Backport of r35856
SVN-Revision: 35858
Felix Fietkau [Fri, 1 Mar 2013 11:22:27 +0000 (11:22 +0000)]
cns3xxx: backport laguna UART setup crash fix from r33719, r33721
SVN-Revision: 35839
Luka Perkov [Tue, 26 Feb 2013 20:05:41 +0000 (20:05 +0000)]
gcc: don't build documentation
backport of r35807
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 35817
Felix Fietkau [Mon, 25 Feb 2013 19:56:26 +0000 (19:56 +0000)]
ath9k: issue a cold reset after failures or after bringing the chip out of full sleep - fixes many kinds of DMA issues
Backport of r35785
SVN-Revision: 35786
John Crispin [Mon, 25 Feb 2013 13:41:54 +0000 (13:41 +0000)]
[lantiq] fixes lantiq dsl firmware naming conventions
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 35783
John Crispin [Mon, 25 Feb 2013 13:41:52 +0000 (13:41 +0000)]
[ramips] backport esw led switch fix
fixes #12989
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 35782
John Crispin [Mon, 25 Feb 2013 13:41:50 +0000 (13:41 +0000)]
[mac80211] fixes mbssid on ralink hardware
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 35781
John Crispin [Mon, 25 Feb 2013 13:41:48 +0000 (13:41 +0000)]
[mac80211] adds missing backport needed for ralink mbssid
fixes #12952
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 35780
Jonas Gorski [Mon, 25 Feb 2013 12:55:59 +0000 (12:55 +0000)]
AA: bcm63xx: Fix sysupgrade for tag-version 7 and 8
Backport of r35724.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 35779
Jonas Gorski [Mon, 25 Feb 2013 12:51:36 +0000 (12:51 +0000)]
AA kernel: modules: don't skip built-in modules for i2c
Backport of r35755.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 35778
Jonas Gorski [Mon, 25 Feb 2013 12:51:35 +0000 (12:51 +0000)]
AA: mac80211: add missing DRIVER_11N_SUPPORT selects
Backport of r35711.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 35777
Jonas Gorski [Mon, 25 Feb 2013 12:51:33 +0000 (12:51 +0000)]
AA: ar71xx: register the micro sd card reader on RB493G
Backport of r35535.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 35776
Felix Fietkau [Fri, 22 Feb 2013 20:13:26 +0000 (20:13 +0000)]
ath9k: fix rssi issues
Backport of r35750
SVN-Revision: 35752
Felix Fietkau [Fri, 22 Feb 2013 20:13:24 +0000 (20:13 +0000)]
ath9k_htc: fix signal strength reporting issues
Backport of r35749
SVN-Revision: 35751
Gabor Juhos [Thu, 21 Feb 2013 18:02:50 +0000 (18:02 +0000)]
AA: ar71xx: fix MAC address assignment on the DIR-825-Bx boards
Backport of r35730.
Use the same MAC addresses as the original firmware.
Based on a patch from #10421.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Tested-by: Gabor Varga <vargagab@gmail.com>
SVN-Revision: 35731
Hauke Mehrtens [Thu, 21 Feb 2013 15:15:28 +0000 (15:15 +0000)]
brcm47xx: fix name of kmod-ocf-ubsec-ssb
backport of r35509.
SVN-Revision: 35725
Felix Fietkau [Sat, 16 Feb 2013 19:01:44 +0000 (19:01 +0000)]
hostapd: fix the scan wait patch for multiple interfaces
Backport of r35630
SVN-Revision: 35631
Felix Fietkau [Sat, 16 Feb 2013 14:26:36 +0000 (14:26 +0000)]
hostapd: add back the patch that waits for interface bringup in ht40, it got lost with the update
Backport of r35619
SVN-Revision: 35620
Gabor Juhos [Sat, 9 Feb 2013 12:53:52 +0000 (12:53 +0000)]
AA: ar71xx: Routerboard 751 Mac Address Offset Fix
Backport of r35519.
We utilize many Routerboard 751's and discovered that our latest batch
of RB751's would not initialize the wireless radio. We have determined
Mikrotik has changed where the mac address was located inside hardconfig.
As such we utilize "routerboot_find_tag" to find the location of the mac
address. We should remove "RB751_MAC_ADDRESS_OFFSET" as it is ambiguous
by machine manufacturing date. The newer batch of RB751's that we received
had a RB751_MAC_ADDRESS_OFFSET 0x10.
Signed-off-by: Davey Hutchison <dhutchison@bluemesh.net>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35531
Tim Yardley [Fri, 8 Feb 2013 22:35:37 +0000 (22:35 +0000)]
openssl: backport r35524
Signed-off-by: Tim Yardley <yardley@gmail.com>
SVN-Revision: 35530
Felix Fietkau [Tue, 29 Jan 2013 22:24:07 +0000 (22:24 +0000)]
libubox: update to latest version, fixes a string corruption issue on JSON formatting
Backport of r35399
SVN-Revision: 35400
Felix Fietkau [Tue, 29 Jan 2013 14:41:40 +0000 (14:41 +0000)]
netifd: update to latest version
fixes DNS servers on reload (#12910)
fixes ubus object race on reload or down/up (#12612)
Backport of r35383
SVN-Revision: 35384
Felix Fietkau [Mon, 28 Jan 2013 20:37:19 +0000 (20:37 +0000)]
netifd: update to latest version, fixes setting addresses/routes on alias interfaces
Backport of r35362
SVN-Revision: 35363
Jo-Philipp Wich [Mon, 28 Jan 2013 16:02:24 +0000 (16:02 +0000)]
AA: feeds: switch to LuCI v0.11.1 tag
SVN-Revision: 35351
Jo-Philipp Wich [Mon, 28 Jan 2013 15:59:01 +0000 (15:59 +0000)]
AA: firewall: backport r35348
SVN-Revision: 35350
Felix Fietkau [Sun, 27 Jan 2013 19:03:44 +0000 (19:03 +0000)]
netfilter: add support for flushing conntrack via /proc
Backport of r35330
SVN-Revision: 35331
Felix Fietkau [Tue, 22 Jan 2013 16:06:39 +0000 (16:06 +0000)]
netifd: sync with trunk r35297, adds another alias support fix
SVN-Revision: 35298
Felix Fietkau [Mon, 21 Jan 2013 13:25:38 +0000 (13:25 +0000)]
ubus: revert the package install section from the trunk sync commit
SVN-Revision: 35267
Jo-Philipp Wich [Mon, 21 Jan 2013 12:25:42 +0000 (12:25 +0000)]
AA: feeds: switch to LuCI v0.11.0 tag
SVN-Revision: 35263
Felix Fietkau [Sun, 20 Jan 2013 15:52:19 +0000 (15:52 +0000)]
netifd: sync with trunk r35251
SVN-Revision: 35254
Felix Fietkau [Sun, 20 Jan 2013 15:52:17 +0000 (15:52 +0000)]
ubus: sync with trunk r35141
SVN-Revision: 35253
Felix Fietkau [Sun, 20 Jan 2013 15:52:16 +0000 (15:52 +0000)]
libubox: sync with trunk r35128
SVN-Revision: 35252
Jo-Philipp Wich [Sat, 19 Jan 2013 10:19:40 +0000 (10:19 +0000)]
AA: busybox: merge r35239
SVN-Revision: 35241
Jonas Gorski [Fri, 18 Jan 2013 15:21:59 +0000 (15:21 +0000)]
AA: generic: rtl8366_smi: only assign pvid if no pvid was set yet
Backport or r35227.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 35228
Luka Perkov [Thu, 17 Jan 2013 14:14:55 +0000 (14:14 +0000)]
uci: sync with trunk
backport of r35013, r33861, r33660
SVN-Revision: 35195