Merge trunk.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 15 Apr 2010 14:09:30 +0000 (16:09 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 15 Apr 2010 14:09:30 +0000 (16:09 +0200)
commit6c103369dc068197b6bbc16c0eceebddc9009c19
tree058db1bc48771128f5bc51b87ab87ec29332ea3f
parent9b705632858cd6d8fa4827e4b86f616499ba8108
parent8db9444ba8a58e3c65fc2b5195eba77fb36b0fcf
Merge trunk.