From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 11 Jan 2006 09:21:55 +0000 (+0000)
Subject: Fix merge collision
X-Git-Tag: Release-1.38.4~17
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c0905c612c4f07624da37f4ee772a1c4e02827a6;p=bacula%2Frescue

Fix merge collision
---