Please pull into v3-2-0-stable

[Karolin Seeger]

Hi John,

On Thu, Jun 19, 2008 at 04:55:17PM -0500, John H Terpstra wrote:
> I hope this is correct info - I had done a few patches but did not previously 
> do a git-push.  I hope this does not mess anything up.

I pushed the first one, but I have to take a closer look at the second
one. Please give me few days. Thanks!

Karolin

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.SerNet.DE, mailto: Info @ SerNet.DE