From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 29 Jan 2014 13:40:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'ms/timezone-transision' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=fc466a563f2a5694213077680407d1f60a735421;hp=-c

Merge remote-tracking branch 'ms/timezone-transision' into next
---

fc466a563f2a5694213077680407d1f60a735421
diff --combined config/rootfiles/common/stage2
index a79662416,3caa839fb..45aaa8a7d
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@@ -66,9 -66,6 +66,9 @@@ root/ipfir
  #usr/bin/perl
  #usr/include
  #usr/lib
 +usr/lib/firewall
 +usr/lib/firewall/firewall-lib.pl
 +usr/lib/firewall/rules.pl
  #usr/lib/libgcc_s.so
  usr/lib/libgcc_s.so.1
  #usr/lib/libstdc++.la
@@@ -94,6 -91,7 +94,7 @@@ usr/local/bin/scanh
  usr/local/bin/setddns.pl
  usr/local/bin/settime
  usr/local/bin/timecheck
+ use/local/bin/timezone-transition
  #usr/local/bin/uname
  usr/local/bin/update-lang-cache
  #usr/local/include