From: Paul Mackerras <paulus@samba.org>
Date: Sun, 9 Nov 2008 11:05:50 +0000 (+1100)
Subject: Merge branch 'dev'
X-Git-Tag: v1.6.1-rc1~49^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbc4941facba9f43f1b95af254d667425d383d45;p=thirdparty%2Fgit.git

Merge branch 'dev'
---

dbc4941facba9f43f1b95af254d667425d383d45