merge of '32f3152ef198ae19e34181438504621d6e5c0270'
authorMichael Krelin <hacker@klever.net>
Sat, 7 Jul 2007 17:18:31 +0000 (17:18 +0000)
committerMichael Krelin <hacker@klever.net>
Sat, 7 Jul 2007 17:18:31 +0000 (17:18 +0000)
commitfa22f18482ce0c7c0afe9dd4c0407a86ecad61dd
tree3ad5499e3dfbccbf1d9ce0821ff944db4f9c85a6
parentb22244ad5c2f588975bd877c0c6285bf58889551
parentdfb53671d8861436d584844078e710a689392594
Merge ... '32f3152ef198ae19e34181438504621d6e5c0270'
     and '7ec9615281babcb1bd33e3299ca47a3cd2e4c8f7'