Merge branch 'upstream'
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 15:36:04 +0000 (17:36 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 15:36:04 +0000 (17:36 +0200)
commit78bc07e5c6efcf21435ab0691b54154950c39aa7
tree434c80841deeb448b82bd179758f131790b6eaa9
parent23d4dffd0a03a885c8c6dc81862ef2c0731741d9
parent562b1310d5c15c7816e5779f2f5738d6a2c0fbee
Merge branch 'upstream'