openwrt/staging/robimarko.git
17 years agoInclude profiles
Florian Fainelli [Wed, 21 Mar 2007 20:11:00 +0000 (20:11 +0000)]
Include profiles

SVN-Revision: 6631

17 years agoFix a typo
Florian Fainelli [Wed, 21 Mar 2007 18:47:41 +0000 (18:47 +0000)]
Fix a typo

SVN-Revision: 6630

17 years agoEnable profiles for adm5120
Florian Fainelli [Wed, 21 Mar 2007 18:10:55 +0000 (18:10 +0000)]
Enable profiles for adm5120

SVN-Revision: 6629

17 years agoFix warnings and add more detailed informations
Florian Fainelli [Wed, 21 Mar 2007 17:23:34 +0000 (17:23 +0000)]
Fix warnings and add more detailed informations

SVN-Revision: 6628

17 years agoAdd image generation for edimax routers
Florian Fainelli [Wed, 21 Mar 2007 15:04:07 +0000 (15:04 +0000)]
Add image generation for edimax routers

SVN-Revision: 6627

17 years agoAdded primary and secondary bootloaders
Hamish Guthrie [Tue, 20 Mar 2007 09:59:17 +0000 (09:59 +0000)]
Added primary and secondary bootloaders

SVN-Revision: 6626

17 years agoprom_free_prom_memory is useless
Florian Fainelli [Tue, 20 Mar 2007 09:23:43 +0000 (09:23 +0000)]
prom_free_prom_memory is useless

SVN-Revision: 6625

17 years agoUse the bcm947xx mtd driver instead
Florian Fainelli [Tue, 20 Mar 2007 09:00:23 +0000 (09:00 +0000)]
Use the bcm947xx mtd driver instead

SVN-Revision: 6624

17 years agouml now needs init=/etc/preinit, fix example in README
Nicolas Thill [Tue, 20 Mar 2007 01:36:56 +0000 (01:36 +0000)]
uml now needs init=/etc/preinit, fix example in README

SVN-Revision: 6622

17 years agoattempt to fix uml kernel config for i386
Nicolas Thill [Tue, 20 Mar 2007 01:32:09 +0000 (01:32 +0000)]
attempt to fix uml kernel config for i386

SVN-Revision: 6621

17 years agoRe-enable adm5120 mtd driver
Florian Fainelli [Mon, 19 Mar 2007 22:42:23 +0000 (22:42 +0000)]
Re-enable adm5120 mtd driver

SVN-Revision: 6620

17 years agoadd an optional parameter to scan_interfaces() that can override the network config...
Felix Fietkau [Mon, 19 Mar 2007 22:06:31 +0000 (22:06 +0000)]
add an optional parameter to scan_interfaces() that can override the network config file (defaults to 'network')

SVN-Revision: 6619

17 years agoRemove 8250 serial driver, enable software watchdog
Florian Fainelli [Mon, 19 Mar 2007 21:52:40 +0000 (21:52 +0000)]
Remove 8250 serial driver, enable software watchdog

SVN-Revision: 6618

17 years agoCFE-ready mtd driver, needs fixing though, update kernel config
Florian Fainelli [Mon, 19 Mar 2007 21:43:06 +0000 (21:43 +0000)]
CFE-ready mtd driver, needs fixing though, update kernel config

SVN-Revision: 6617

17 years agoFix the baudrate macro
Florian Fainelli [Mon, 19 Mar 2007 19:51:26 +0000 (19:51 +0000)]
Fix the baudrate macro

SVN-Revision: 6616

17 years agoFix the uart patch
Florian Fainelli [Mon, 19 Mar 2007 19:38:12 +0000 (19:38 +0000)]
Fix the uart patch

SVN-Revision: 6615

17 years agoPreliminary ADM5120 support, marked as broken
Florian Fainelli [Mon, 19 Mar 2007 17:34:37 +0000 (17:34 +0000)]
Preliminary ADM5120 support, marked as broken

SVN-Revision: 6614

17 years agoRemove initrd code leftovers. Also fixes "Bad page state" on boot (kernel tried to...
Eugene Konev [Mon, 19 Mar 2007 17:25:06 +0000 (17:25 +0000)]
Remove initrd code leftovers. Also fixes "Bad page state" on boot (kernel tried to free initramfs twice).

SVN-Revision: 6613

17 years agoUpdated content of wireless.tex, next version will have example configs
Nicholas DePetrillo [Mon, 19 Mar 2007 15:35:55 +0000 (15:35 +0000)]
Updated content of wireless.tex, next version will have example configs

SVN-Revision: 6612

17 years agoAdd forgotten part of vlynq irq setup
Eugene Konev [Sun, 18 Mar 2007 16:00:28 +0000 (16:00 +0000)]
Add forgotten part of vlynq irq setup

SVN-Revision: 6606

17 years agoAdd acx package
Eugene Konev [Sun, 18 Mar 2007 14:43:06 +0000 (14:43 +0000)]
Add acx package

SVN-Revision: 6605

17 years agoar7-2.4 cleanup - Switch to generic init scripts (/sbin/mount_root, /bin/firstboot...
Eugene Konev [Sun, 18 Mar 2007 14:18:56 +0000 (14:18 +0000)]
ar7-2.4 cleanup - Switch to generic init scripts (/sbin/mount_root, /bin/firstboot, /etc/preinit), failsafe part moved to /etc/preinit.arch. This should fix #1449 with an added benefit of using mini_fo. - Switch to generic /etc/config/network. - ar7 flashmap: change "OpenWrt" to "rootfs_data", move ar7_mtd_cleanup out of .exit.

SVN-Revision: 6604

17 years agoMove /sys on pivot_root too
Eugene Konev [Sun, 18 Mar 2007 13:47:28 +0000 (13:47 +0000)]
Move /sys on pivot_root too

SVN-Revision: 6603

17 years agoFix a warning
Florian Fainelli [Sun, 18 Mar 2007 13:06:33 +0000 (13:06 +0000)]
Fix a warning

SVN-Revision: 6602

17 years agoAdd bssid fix from #1281
Florian Fainelli [Sun, 18 Mar 2007 12:59:44 +0000 (12:59 +0000)]
Add bssid fix from #1281

SVN-Revision: 6601

17 years agoAdd ar7-2.6 port (marked as broken for now).
Eugene Konev [Sun, 18 Mar 2007 09:40:51 +0000 (09:40 +0000)]
Add ar7-2.6 port (marked as broken for now).

SVN-Revision: 6600

17 years agoAdd srec2bin to firmware-utils
Eugene Konev [Sun, 18 Mar 2007 09:33:39 +0000 (09:33 +0000)]
Add srec2bin to firmware-utils

SVN-Revision: 6599

17 years agoMake lzma-loader sdram mapping configurable (#1169)
Eugene Konev [Sun, 18 Mar 2007 09:32:22 +0000 (09:32 +0000)]
Make lzma-loader sdram mapping configurable (#1169)

SVN-Revision: 6598

17 years agoChanged pin selections in low-level mmc driver
Hamish Guthrie [Sat, 17 Mar 2007 16:19:09 +0000 (16:19 +0000)]
Changed pin selections in low-level mmc driver

SVN-Revision: 6596

17 years agoupgrade dnsmasq to latest version, rewrite dnsmasq init script for uci, rename /bin...
Felix Fietkau [Sat, 17 Mar 2007 13:31:13 +0000 (13:31 +0000)]
upgrade dnsmasq to latest version, rewrite dnsmasq init script for uci, rename /bin/ipcalc to /bin/ipcalc.sh (fixes #1452)

SVN-Revision: 6595

17 years agoremove duplicate section to find bridge name
Travis Kemen [Sat, 17 Mar 2007 03:56:14 +0000 (03:56 +0000)]
remove duplicate section to find bridge name

SVN-Revision: 6591

17 years agofix default netmask
Felix Fietkau [Sat, 17 Mar 2007 03:15:41 +0000 (03:15 +0000)]
fix default netmask

SVN-Revision: 6589

17 years agospeed up package/install
Felix Fietkau [Sat, 17 Mar 2007 02:54:16 +0000 (02:54 +0000)]
speed up package/install

SVN-Revision: 6588

17 years agofix a small bug in the unpack code
Felix Fietkau [Fri, 16 Mar 2007 21:32:59 +0000 (21:32 +0000)]
fix a small bug in the unpack code

SVN-Revision: 6587

17 years agopackage libssp for apps that need it (only enabled for gcc4)
Felix Fietkau [Fri, 16 Mar 2007 20:37:04 +0000 (20:37 +0000)]
package libssp for apps that need it (only enabled for gcc4)

SVN-Revision: 6584

17 years agoremove some debug code that slipped into the commit
Felix Fietkau [Fri, 16 Mar 2007 20:32:32 +0000 (20:32 +0000)]
remove some debug code that slipped into the commit

SVN-Revision: 6583

17 years agoadd file type autodetection for the unpack command and nuke PKG_CAT:= in lots of...
Felix Fietkau [Fri, 16 Mar 2007 20:21:39 +0000 (20:21 +0000)]
add file type autodetection for the unpack command and nuke PKG_CAT:= in lots of places

SVN-Revision: 6582

17 years agore-enable SDK=1 and DEVELOPER=1 overrides for building all packages
Felix Fietkau [Fri, 16 Mar 2007 20:20:19 +0000 (20:20 +0000)]
re-enable SDK=1 and DEVELOPER=1 overrides for building all packages

SVN-Revision: 6581

17 years agoadd a default for PKG_BUILD_DIR and PKG_INSTALL_DIR (will use KERNEL_BUILD_DIR if...
Felix Fietkau [Fri, 16 Mar 2007 19:18:55 +0000 (19:18 +0000)]
add a default for PKG_BUILD_DIR and PKG_INSTALL_DIR (will use KERNEL_BUILD_DIR if kernel.mk is included, BUILD_DIR otherwise)

SVN-Revision: 6580

17 years agoChanged kernel configs to enable more packages. Added additional dependencies to...
Hamish Guthrie [Fri, 16 Mar 2007 18:53:35 +0000 (18:53 +0000)]
Changed kernel configs to enable more packages. Added additional dependencies to mmc module in the modules tree

SVN-Revision: 6579

17 years agoFix compilation errors with xt_portscan
Florian Fainelli [Fri, 16 Mar 2007 18:35:48 +0000 (18:35 +0000)]
Fix compilation errors with xt_portscan

SVN-Revision: 6578

17 years agoFix the serial driver with the devfs removal
Florian Fainelli [Fri, 16 Mar 2007 18:33:46 +0000 (18:33 +0000)]
Fix the serial driver with the devfs removal

SVN-Revision: 6577

17 years agoadd a new 'option disabled' to wifi-device
Mike Baker [Fri, 16 Mar 2007 13:56:36 +0000 (13:56 +0000)]
add a new 'option disabled' to wifi-device

SVN-Revision: 6576

17 years agoadd final fix for brcm47xx-2.6 memory corruption (patch from #1465)
Felix Fietkau [Fri, 16 Mar 2007 12:26:33 +0000 (12:26 +0000)]
add final fix for brcm47xx-2.6 memory corruption (patch from #1465)

SVN-Revision: 6575

17 years agorevert part of [6573] to keep the speedup of metadata scanning
Felix Fietkau [Fri, 16 Mar 2007 12:22:11 +0000 (12:22 +0000)]
revert part of [6573] to keep the speedup of metadata scanning

SVN-Revision: 6574

17 years agoformatting and trivial cleanup
Mike Baker [Fri, 16 Mar 2007 06:12:53 +0000 (06:12 +0000)]
formatting and trivial cleanup

SVN-Revision: 6573

17 years agoAdd an 'Image Configuration' menu to menuconfig Packages can export a list of config...
Felix Fietkau [Fri, 16 Mar 2007 03:02:31 +0000 (03:02 +0000)]
Add an 'Image Configuration' menu to menuconfig Packages can export a list of config options with labels and data types through the metadata. The selected config values will be exported to the target filesystem in /etc/uci-defaults and applied on the first boot.

SVN-Revision: 6572

17 years agosplit package.mk and clean up build system code (based on patch by mbm), makes the...
Felix Fietkau [Thu, 15 Mar 2007 23:57:18 +0000 (23:57 +0000)]
split package.mk and clean up build system code (based on patch by mbm), makes the code more readable and speeds up metadata scan

SVN-Revision: 6571

17 years agoEnable bridge, disable wifi Easier to deal with "how do I enable wifi" than "why...
Mike Baker [Thu, 15 Mar 2007 23:17:16 +0000 (23:17 +0000)]
Enable bridge, disable wifi Easier to deal with "how do I enable wifi" than "why isn't wifi working?"

SVN-Revision: 6570

17 years agoenable ext2 by default for rb532 (fixes #1466)
Felix Fietkau [Thu, 15 Mar 2007 18:53:00 +0000 (18:53 +0000)]
enable ext2 by default for rb532 (fixes #1466)

SVN-Revision: 6569

17 years agobrcm47xx: add a few nops to keep the cpu happy
Felix Fietkau [Thu, 15 Mar 2007 12:07:43 +0000 (12:07 +0000)]
brcm47xx: add a few nops to keep the cpu happy

SVN-Revision: 6568

17 years agoadded TXpower, antenna diversity, distance, backround scan, PSK and PSK2 settings...
Travis Kemen [Thu, 15 Mar 2007 03:21:35 +0000 (03:21 +0000)]
added TXpower, antenna diversity, distance, backround scan, PSK and PSK2 settings, from #1287 #1255

SVN-Revision: 6567

17 years agoChange mtu value for pppoa and pppoe (#945)
Florian Fainelli [Wed, 14 Mar 2007 19:00:10 +0000 (19:00 +0000)]
Change mtu value for pppoa and pppoe (#945)

SVN-Revision: 6566

17 years agofix kmod-switch compile on brcm-2.4 (#1461)
Felix Fietkau [Wed, 14 Mar 2007 13:42:21 +0000 (13:42 +0000)]
fix kmod-switch compile on brcm-2.4 (#1461)

SVN-Revision: 6565

17 years agofix up remaining parts for the brcm47xx-2.6 port (tested on wgt634u), nuke the old...
Felix Fietkau [Wed, 14 Mar 2007 03:37:40 +0000 (03:37 +0000)]
fix up remaining parts for the brcm47xx-2.6 port (tested on wgt634u), nuke the old brcm-2.6 port, close #1312, #1451

SVN-Revision: 6564

17 years agoadd reboot fix from #1312
Felix Fietkau [Wed, 14 Mar 2007 01:26:57 +0000 (01:26 +0000)]
add reboot fix from #1312

SVN-Revision: 6563

17 years agoadd diag and switch support for brcm47xx-2.6
Felix Fietkau [Wed, 14 Mar 2007 01:19:24 +0000 (01:19 +0000)]
add diag and switch support for brcm47xx-2.6

SVN-Revision: 6562

17 years agoadd -i <include file> and -f <ahtml file> options for awx interpreter (requested...
Felix Fietkau [Wed, 14 Mar 2007 01:13:57 +0000 (01:13 +0000)]
add -i <include file> and -f <ahtml file> options for awx interpreter (requested by mbm)

SVN-Revision: 6561

17 years agofix the patchlevel of the busybox stty patch
Felix Fietkau [Tue, 13 Mar 2007 12:47:17 +0000 (12:47 +0000)]
fix the patchlevel of the busybox stty patch

SVN-Revision: 6560

17 years agoSmall bug fix to package/kernel/modules/other.mk stty broken in busybox 1.4.1, added...
Hamish Guthrie [Tue, 13 Mar 2007 12:18:35 +0000 (12:18 +0000)]
Small bug fix to package/kernel/modules/other.mk stty broken in busybox 1.4.1, added patch with fixed code from BB SVN. This will need to be removed when 1.4.2 is released.

SVN-Revision: 6559

17 years agoremove screwy network config override from x86-2.6 base-files
Felix Fietkau [Mon, 12 Mar 2007 19:23:18 +0000 (19:23 +0000)]
remove screwy network config override from x86-2.6 base-files

SVN-Revision: 6558

17 years agoadd preliminary IOP32x support, mark it broken for now
Imre Kaloz [Sun, 11 Mar 2007 19:49:50 +0000 (19:49 +0000)]
add preliminary IOP32x support, mark it broken for now

SVN-Revision: 6557

17 years agofix gcc version selection
Imre Kaloz [Sun, 11 Mar 2007 19:26:39 +0000 (19:26 +0000)]
fix gcc version selection

SVN-Revision: 6556

17 years agooops... forgot to remove line
Felix Fietkau [Sun, 11 Mar 2007 19:12:49 +0000 (19:12 +0000)]
oops... forgot to remove line

SVN-Revision: 6555

17 years agoreplace libcgi with some code extracted from haserl - libcgi is too inflexible and...
Felix Fietkau [Sun, 11 Mar 2007 18:17:08 +0000 (18:17 +0000)]
replace libcgi with some code extracted from haserl - libcgi is too inflexible and breaks rrdtool

SVN-Revision: 6554

17 years agofix staging dir installation of libcgi
Felix Fietkau [Sun, 11 Mar 2007 17:37:58 +0000 (17:37 +0000)]
fix staging dir installation of libcgi

SVN-Revision: 6553

17 years agofix typo (#1454)
Felix Fietkau [Sun, 11 Mar 2007 10:38:56 +0000 (10:38 +0000)]
fix typo (#1454)

SVN-Revision: 6550

17 years agoadd awx (awk web extension) - experimental core for a new web interface framework
Felix Fietkau [Sun, 11 Mar 2007 05:35:46 +0000 (05:35 +0000)]
add awx (awk web extension) - experimental core for a new web interface framework

SVN-Revision: 6549

17 years agoadd libcgi
Felix Fietkau [Sun, 11 Mar 2007 05:07:58 +0000 (05:07 +0000)]
add libcgi

SVN-Revision: 6548

17 years agoenable httpd config option for running scripts through an interpreter
Felix Fietkau [Sun, 11 Mar 2007 05:07:26 +0000 (05:07 +0000)]
enable httpd config option for running scripts through an interpreter

SVN-Revision: 6547

17 years agooops... forgot to make x86-2.6 ext2 images use preinit as well :)
Felix Fietkau [Sun, 11 Mar 2007 00:04:17 +0000 (00:04 +0000)]
oops... forgot to make x86-2.6 ext2 images use preinit as well :)

SVN-Revision: 6546

17 years agoAdded dependency on AT91 build
Hamish Guthrie [Sat, 10 Mar 2007 16:12:40 +0000 (16:12 +0000)]
Added dependency on AT91 build

SVN-Revision: 6545

17 years agoAdded MMC/SD Card module support
Hamish Guthrie [Sat, 10 Mar 2007 16:06:37 +0000 (16:06 +0000)]
Added MMC/SD Card module support

SVN-Revision: 6544

17 years agomore devfs related bugs
Mike Baker [Fri, 9 Mar 2007 18:39:34 +0000 (18:39 +0000)]
more devfs related bugs

SVN-Revision: 6543

17 years agofix up the netconfig script after the devfs=>hotplug2 migration
Felix Fietkau [Fri, 9 Mar 2007 18:20:54 +0000 (18:20 +0000)]
fix up the netconfig script after the devfs=>hotplug2 migration

SVN-Revision: 6542

17 years agofallback when devfs names aren't found
Mike Baker [Fri, 9 Mar 2007 08:58:37 +0000 (08:58 +0000)]
fallback when devfs names aren't found

SVN-Revision: 6541

17 years agoChanged default compiler for 2.6 kernels to 4.1.2
Hamish Guthrie [Wed, 7 Mar 2007 22:32:10 +0000 (22:32 +0000)]
Changed default compiler for 2.6 kernels to 4.1.2

SVN-Revision: 6539

17 years agosplit out scsi module support and add ata piix support
Tim Yardley [Wed, 7 Mar 2007 15:38:45 +0000 (15:38 +0000)]
split out scsi module support and add ata piix support

SVN-Revision: 6535

17 years agoAdded GPIO driver
Hamish Guthrie [Wed, 7 Mar 2007 11:46:24 +0000 (11:46 +0000)]
Added GPIO driver

SVN-Revision: 6534

17 years agoFix config, set directory block to -1 for redboot.
Mike Albon [Tue, 6 Mar 2007 23:13:20 +0000 (23:13 +0000)]
Fix config, set directory block to -1 for redboot.

SVN-Revision: 6533

17 years agoadd new config option for the hostname in /etc/config/system (fixes #1302, #1438)
Felix Fietkau [Tue, 6 Mar 2007 21:28:57 +0000 (21:28 +0000)]
add new config option for the hostname in /etc/config/system (fixes #1302, #1438)

SVN-Revision: 6532

17 years agoAdd support for LED drivers (clock tick and CPU activity) Removed partition support...
Hamish Guthrie [Tue, 6 Mar 2007 20:40:41 +0000 (20:40 +0000)]
Add support for LED drivers (clock tick and CPU activity) Removed partition support (done on command line now)

SVN-Revision: 6531

17 years agoadd vga console support for x86-2.6 images (fixes #1342, #840)
Felix Fietkau [Tue, 6 Mar 2007 19:13:40 +0000 (19:13 +0000)]
add vga console support for x86-2.6 images (fixes #1342, #840)

SVN-Revision: 6530

17 years agoModified partition table to support jffs2
Hamish Guthrie [Mon, 5 Mar 2007 10:30:34 +0000 (10:30 +0000)]
Modified partition table to support jffs2

SVN-Revision: 6529

17 years agoChaged kernel config so default builds cleanly
Hamish Guthrie [Mon, 5 Mar 2007 09:15:45 +0000 (09:15 +0000)]
Chaged kernel config so default builds cleanly

SVN-Revision: 6528

17 years agotrunk.. same deal as changeset:6526
Tim Yardley [Mon, 5 Mar 2007 01:38:44 +0000 (01:38 +0000)]
trunk.. same deal as changeset:6526

SVN-Revision: 6527

17 years agofix squashfs for ixp4xx
Imre Kaloz [Mon, 5 Mar 2007 00:47:13 +0000 (00:47 +0000)]
fix squashfs for ixp4xx

SVN-Revision: 6524

17 years agoadd missing init=/etc/preinit cmdline parameter
Felix Fietkau [Mon, 5 Mar 2007 00:38:37 +0000 (00:38 +0000)]
add missing init=/etc/preinit cmdline parameter

SVN-Revision: 6523

17 years agoadd squashfs support for ixp4xx
Felix Fietkau [Mon, 5 Mar 2007 00:21:30 +0000 (00:21 +0000)]
add squashfs support for ixp4xx

SVN-Revision: 6522

17 years agomore hotplug2/mdev/devfs related fixups, this time for broadcom
Felix Fietkau [Sun, 4 Mar 2007 23:55:07 +0000 (23:55 +0000)]
more hotplug2/mdev/devfs related fixups, this time for broadcom

SVN-Revision: 6519

17 years agofix a compile error caused by the devfs removal
Felix Fietkau [Sun, 4 Mar 2007 23:34:50 +0000 (23:34 +0000)]
fix a compile error caused by the devfs removal

SVN-Revision: 6518

17 years agoenable ne2k-pci by default
Felix Fietkau [Sun, 4 Mar 2007 21:25:25 +0000 (21:25 +0000)]
enable ne2k-pci by default

SVN-Revision: 6517

17 years agoSVN-Revision: 6516
Imre Kaloz [Sun, 4 Mar 2007 21:17:17 +0000 (21:17 +0000)]
SVN-Revision: 6516

17 years agofix metadata scan for profile split
Felix Fietkau [Sun, 4 Mar 2007 21:07:29 +0000 (21:07 +0000)]
fix metadata scan for profile split

SVN-Revision: 6515

17 years agoreorder target profiles
Felix Fietkau [Sun, 4 Mar 2007 20:43:39 +0000 (20:43 +0000)]
reorder target profiles

SVN-Revision: 6514

17 years agoadd some missing deps for the metadata files
Felix Fietkau [Sun, 4 Mar 2007 20:39:56 +0000 (20:39 +0000)]
add some missing deps for the metadata files

SVN-Revision: 6513

17 years agonuke mdev and replace it with hotplug2 :)
Felix Fietkau [Sun, 4 Mar 2007 20:31:53 +0000 (20:31 +0000)]
nuke mdev and replace it with hotplug2 :)

SVN-Revision: 6512

17 years agomake hotplug2 depend on udevtrigger
Felix Fietkau [Sun, 4 Mar 2007 20:15:32 +0000 (20:15 +0000)]
make hotplug2 depend on udevtrigger

SVN-Revision: 6511

17 years agoadd hotplug2
Felix Fietkau [Sun, 4 Mar 2007 19:55:47 +0000 (19:55 +0000)]
add hotplug2

SVN-Revision: 6510

17 years agoupgrade udev to latest version and add separate package for udevtrigger (will be...
Felix Fietkau [Sun, 4 Mar 2007 19:49:49 +0000 (19:49 +0000)]
upgrade udev to latest version and add separate package for udevtrigger (will be used by hotplug2)

SVN-Revision: 6509