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)
     and '7cb0692da0f14131ab23beef52a20dd492fe8312'


Trivial merge