From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 2 Oct 2011 19:27:09 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-core54~13^2~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e137ec4ecf166320ce92d5068e864034e19b8f48;p=ipfire-2.x.git

Merge commit 'origin/master' into next

Conflicts:
	lfs/libevent2
	lfs/transmission
	src/paks/transmission/install.sh
	src/paks/transmission/uninstall.sh
---

e137ec4ecf166320ce92d5068e864034e19b8f48
diff --cc lfs/libevent2
index 1fbc7db091,401ccbeaa3..0756ab15c9
--- a/lfs/libevent2
+++ b/lfs/libevent2
@@@ -62,7 -67,8 +67,9 @@@ $(patsubst %,$(DIR_DL)/%,$(objects)) 
  
  $(subst %,%_MD5,$(objects)) :
  	@$(MD5)
 +
+ dist: 
+ 	@$(PAK)
  ###############################################################################
  # Installation Details
  ###############################################################################