Merge commit '4364379b786e693710259b20e7cc0c9ab33c1b8b'
commit5d13dc527368b369405e21319c67319fe39860ce
authorPetr Baudis <pasky@ucw.cz>
Fri, 28 Jan 2011 09:48:34 +0000 (28 10:48 +0100)
committerPetr Baudis <pasky@ucw.cz>
Fri, 28 Jan 2011 09:48:34 +0000 (28 10:48 +0100)
tree39de185f44926f02d913477a7df3d5e4e175715c
parent0544260dc18d543c96064f94e467a545e106ee17
parent4364379b786e693710259b20e7cc0c9ab33c1b8b
Merge commit '4364379b786e693710259b20e7cc0c9ab33c1b8b'