merge of '32e97ff195b391fe0a9c6e1af5eada1538dbfa52'
authorMike Westerhof <mwester@dls.net>
Mon, 13 Oct 2008 16:58:08 +0000 (16:58 +0000)
committerMike Westerhof <mwester@dls.net>
Mon, 13 Oct 2008 16:58:08 +0000 (16:58 +0000)
commitb87638d0e82a81c8a6cb32a5041ec40d41e05e45
tree70f7200d7cb3ade840fcf474d4b7a2648774c7c6
parent329b22afb18495396bf06bd96cf8a5ffcaf955f4
parent8b015fe307bd14b93f7c45fb68fdb61092646310
Merge ... '32e97ff195b391fe0a9c6e1af5eada1538dbfa52'
     and '7cb0692da0f14131ab23beef52a20dd492fe8312'