From: Bdale Garbee <bdale@gag.com>
Date: Thu, 26 Nov 2009 23:11:50 +0000 (-0700)
Subject: Merge commit 'upstream/2.6.1p2'
X-Git-Tag: debian/2.6.1p2-1~7
X-Git-Url: https://git.gag.com/?p=debian%2Famanda;a=commitdiff_plain;h=e9de482962ca61612054c6e0382814b04e416129

Merge commit 'upstream/2.6.1p2'

Conflicts:
	server-src/diskfile.c
---

e9de482962ca61612054c6e0382814b04e416129