merge of '93c76dabe575881b7335e6aca044cb6fb6aceffe'
authorMatthias Hentges <oe@hentges.net>
Tue, 5 Jun 2007 02:30:41 +0000 (02:30 +0000)
committerMatthias Hentges <oe@hentges.net>
Tue, 5 Jun 2007 02:30:41 +0000 (02:30 +0000)
commit8a55be921673301bbc0150e5313c8b2b6b28d07e
treeaf5f15b4c016dafd39afe6b52749755a0ae27fab
parentaccb9b8ad19a19ff84d4476175119f01bf528144
parent89ccdc8961e9239340d0c9241ec89095729670e6
Merge ... '93c76dabe575881b7335e6aca044cb6fb6aceffe'
     and 'fa1c000d2eb11e81b0552935ffbdfcbf497dde8a'