merge
commit8b5780dc9c3ca695c5e89eeccb0b4c1d51c695d3
authorOndrej Certik <ondrej@certik.cz>
Fri, 28 Dec 2007 23:57:04 +0000 (29 00:57 +0100)
committerOndrej Certik <ondrej@certik.cz>
Fri, 28 Dec 2007 23:57:04 +0000 (29 00:57 +0100)
tree096c81a3612b8243ca07f041433d405a4b4e62e3
parent7a0966dac2c093865caf50b448f0e842de824679
parent719e43fb4654117d5362ea9ace51e9fb7929de01
merge