Merge fixes from abderrahim.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 22 Jul 2009 19:04:45 +0000 (21:04 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 22 Jul 2009 19:04:45 +0000 (21:04 +0200)
commitcef9b32cf792cd696bc10aae5570b0a216621b4f
tree54986b01f56d4bb69f67c8ec6ed21395c04ac51e
parent33f99bc0e935ca1cf02ebf90d06b1491a3cbe244
parent0f30f453818526521c4ad48a82583283ce4052de
Merge fixes from abderrahim.