merge of '122eeaf13917f2390126c38cbde2f7e519a5709c'
authorHolger Freyther <zecke@selfish.org>
Sat, 19 Aug 2006 09:15:43 +0000 (09:15 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 19 Aug 2006 09:15:43 +0000 (09:15 +0000)
commitf009d865f357985f30826466a78a23e341450c38
tree90aff3f935e8041b50ffedfb47b5cdd79cdf2978
parentb71cd8834d2dbef6e241922cce697aa082d4cc44
parent88d78536300e5a75084fe8b222a0207b3d61eb26
Merge ... '122eeaf13917f2390126c38cbde2f7e519a5709c'
     and '7f2837654b6e146fe435c75d55d0e5f8440a2756'