From: Paul Mackerras <paulus@samba.org>
Date: Thu, 30 Apr 2009 23:34:57 +0000 (+1000)
Subject: Merge branch 'master' into dev
X-Git-Tag: v1.6.6-rc2~2^2~2^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fced80080675fe4dc8e3641083dd3742675f4b7b?ds=inline;hp=--cc

Merge branch 'master' into dev
---

fced80080675fe4dc8e3641083dd3742675f4b7b