merge of '46bdfedbe1ecde1685daaddc2f0b8a46939f17c4'
authorMatthias Hentges <oe@hentges.net>
Sat, 30 Jun 2007 18:21:24 +0000 (18:21 +0000)
committerMatthias Hentges <oe@hentges.net>
Sat, 30 Jun 2007 18:21:24 +0000 (18:21 +0000)
commit350e6d7ed17fa91e1ddb42ee77ef7175f513a7df
treeee8026afcba1a0e12a64a812d1acd64555b7e200
parent189a49264c85accb99a78d009b4c1dc5cc963778
parent4e2594811904a36794d8e51ea7c07f2566797079
Merge ... '46bdfedbe1ecde1685daaddc2f0b8a46939f17c4'
     and 'fd22e92470cbc7bd32d4c2d747a6577afd80516e'