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: http://git.tremily.us/?a=commitdiff_plain;h=fced80080675fe4dc8e3641083dd3742675f4b7b;p=git.git

Merge branch 'master' into dev
---

fced80080675fe4dc8e3641083dd3742675f4b7b