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

Conflicts:
	dbus/dbus.nm
	openldap/openldap.nm

diff --cc dbus/dbus.nm
index b96796b7f218bab8e9be51bd2e5aae7c3ce874d5,c751bf14c4ca430396a4aba9fd8460b396eeae6e..6bfd2ea6bcbcbfda08b25619d1cd976d64719a6c
--- 1/dbus/dbus.nm
--- 2/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = dbus
 -version    = 1.4.14
 -release    = 3
 +version    = 1.4.16
- release    = 1
++release    = 2
  
  groups     = System/Daemons
  url        = http://www.freedesktop.org/software/dbus/

diff --cc openldap/openldap.nm
index a664039f13542582ef68e02a078dc101a93eff1b,699f023605e2ac3bf443e677b02a7c5bc739ffd5..c6bfb7ee2ec901da58859bf99130d6280d872e1b
--- 1/openldap/openldap.nm
--- 2/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = openldap
 -version    = 2.4.25
 -release    = 3
 +version    = 2.4.28
- release    = 1
++release    = 2
  
  groups     = System/Daemons
  url        = http://www.openldap.org/