forked from I2P_Developers/i2p.i2p
and 'aeec86a504a5fd67dff12d6775411a9c865d42ad' Merge to aeec86a504a5fd67dff12d6775411a9c865d42ad which is just before the 2009-08-11 whitespace cleanup at ef1c23821d433903124f7612cbc46ac096fc985b
and 'aeec86a504a5fd67dff12d6775411a9c865d42ad' Merge to aeec86a504a5fd67dff12d6775411a9c865d42ad which is just before the 2009-08-11 whitespace cleanup at ef1c23821d433903124f7612cbc46ac096fc985b