Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
	config/rootfiles/packages/miniupnpd

diff --combined lfs/fireinfo
index 09961283342280d26ee61fc78417a1cb9e2cc05f,d898a399c2c4dee8a5561dfda8c881fd1355ecd4..a0aafbf5bcd6b452c0259b8cd63058960fc9813e
--- 1/lfs/fireinfo
--- 2/lfs/fireinfo
+++ b/lfs/fireinfo
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
- # Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+ # Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@@ -24,7 -24,7 +24,7 @@@
  
  include Config
  
 -VER        = 0.2
 +VER        = 0.3
  
  THISAPP    = fireinfo-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@@ -40,7 -40,7 +40,7 @@@ objects = $(DL_FILE
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
 -$(DL_FILE)_MD5 = 30870d3a8f9d47611efc148a76a5b87f
 +$(DL_FILE)_MD5 = 2105bf88213dfd2198891a96eeb08949
  
  install : $(TARGET)