Merge branch 'master' into DEVEL

diff --cc samba4.spec
index 2a1da6a22e003a70366b8d0eb64ffa38a0f83b81,1ba196066c6d6810de8bc33d969517a98dcf9593..4e531686ab3f04d59e08ad3927c22010474f1ad8
--- 1/samba4.spec
--- 2/samba4.spec
+++ b/samba4.spec
@@@ -22,8 -20,8 +20,8 @@@
  Summary:      Active Directory server
  Summary(pl.UTF-8):    Serwer Active Directory
  Name:         samba4
- Version:      4.1.3
+ Version:      4.1.4
 -Release:      2
 +Release:      2.1
  Epoch:                1
  License:      GPL v3
  Group:                Networking/Daemons
@@@ -312,17 -311,12 +311,17 @@@ przez narzędzia testowe dla serwerów 
  Summary:      SMB server
  Summary(pl.UTF-8):    Serwer SMB
  Group:                Networking/Daemons
- Requires:     samba3-common = %{epoch}:%{version}-%{release}
  Requires:     %{name}-common-server = %{epoch}:%{version}-%{release}
+ Requires:     samba3-common = %{epoch}:%{version}-%{release}
  # smbd links with libcups
  %{?with_cups:Requires:        cups-lib >= 1:1.2.0}
 +Requires:     logrotate >= 3.7-4
 +Requires:     rc-scripts >= 0.4.0.12
 +Requires:     setup >= 2.4.6-7
 +Obsoletes:    samba < 1:4.0.0-1
  Obsoletes:    samba-pdb-xml
  Obsoletes:    samba-vfs-block
 +Obsoletes:    samba3-server < 1:4.1.3-2.1
  
  %description -n samba3
  Samba provides an SMB server which can be used to provide network