merge of '411648a693b0891df1f4d2e407cb14d3641cde2a'
authorSergey Lapin <slapinid@gmail.com>
Sat, 1 Dec 2007 03:30:21 +0000 (03:30 +0000)
committerSergey Lapin <slapinid@gmail.com>
Sat, 1 Dec 2007 03:30:21 +0000 (03:30 +0000)
commit58788b6dee8522b73c315998783e29e7c915130d
tree61814e633f44a097711be04c1015101c4f1a3ac9
parent00a5e8de5a0fe2c557405145a13190bbb97e365c
parent7ad5931818a2296eb5398e031fa1eb2ea4d0f0db
Merge ... '411648a693b0891df1f4d2e407cb14d3641cde2a'
     and '71df4f75a1331353855f0e6a93d2e806439e90b3'