Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	usbutils/usbutils.nm

diff --cc usbutils/usbutils.nm
index 393b7d13352a10f4b333fa2ebf20fe43f3b1faea,bdfbad785216ea69ddc23b7ef6d205c5ee7e0e0e..6c3b98d1e482604a6b941cacc87003bd768c754a
--- 1/usbutils/usbutils.nm
--- 2/usbutils/usbutils.nm
+++ b/usbutils/usbutils.nm
@@@ -5,8 -5,8 +5,8 @@@
  
  name       = usbutils
  epoch      = 1
- version    = 003
+ version    = 005
 -release    = 2
 +release    = 3
  
  groups     = System/Tools
  url        = http://www.linux-usb.org/
@@@ -21,7 -21,11 +21,10 @@@ source_dl  = http://www.kernel.org/pub/
  
  build
        requires
 -              libusb-devel
 -              pkg-config
+               autoconf
+               automake
+               hwdata
 +              libusbx-devel
                zlib-devel
        end