[MERGE REQUEST] Couple of small fixes

[Martin Pool]

On 23 Nov 2005, Jelmer Vernooij <jelmer at samba.org> wrote:
> Hi Martin,
> 
> Please consider merging the following changes from my integration branch at 
> http://samba.org/~jelmer/bzr/integration .

Thanks, merged.

(See http://lists.ubuntu.com/mailman/listinfo/bazaar-commits for details
of all merges)

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051123/22090a2c/attachment.pgp