Same patches that I just merged for 3.6 and 3.7, except with one
additional fix that went into v3.4 that needed to be included.
Submitted more for the benefit of the AA branch than for trunk.
[juhosg: refresh the patch with quilt]
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34813