merge of '8725fc715529f6dba921a0a92e01e4e68124bfdb'
authorHolger Freyther <zecke@selfish.org>
Fri, 25 Jan 2008 17:37:04 +0000 (17:37 +0000)
committerHolger Freyther <zecke@selfish.org>
Fri, 25 Jan 2008 17:37:04 +0000 (17:37 +0000)
commite20bbf1c69cb37642bb535fe23b7834826853f9b
tree8dbd9c8b9e468ff754f63abfdad6fc6e78659438
parent93de7123f309ba153a31b3089c4b53a5ba58f4ad
parent78c5ca2bf6696bc378cd50cabc5a5c640b9eb262
Merge ... '8725fc715529f6dba921a0a92e01e4e68124bfdb'
     and '9f6c6e0638e90b5a038c5a87f9d87060ab2a3dbf'