merge of '30ae730925a12988661810facbdca0b1b0399934'
authorMike Westerhof <mwester@dls.net>
Fri, 22 Aug 2008 20:57:34 +0000 (20:57 +0000)
committerMike Westerhof <mwester@dls.net>
Fri, 22 Aug 2008 20:57:34 +0000 (20:57 +0000)
     and '704c652447ad25124b4af7103ee48137c5db36b2'


Trivial merge