Merge commit '4e2bd8155d199c421cb00957d41ab00a03c2e440'
commit14ebb5a6ff0092cf82d20705decc4015b61eb491
authorPetr Baudis <pasky@ucw.cz>
Sun, 30 Oct 2011 19:26:25 +0000 (30 20:26 +0100)
committerPetr Baudis <pasky@ucw.cz>
Sun, 30 Oct 2011 19:26:25 +0000 (30 20:26 +0100)
tree39245791f19585171d087be8139e876bad21481d
parentb533ff98dc3f04bef9f4bf9dd49a95cf885fdbb5
parent4e2bd8155d199c421cb00957d41ab00a03c2e440
Merge commit '4e2bd8155d199c421cb00957d41ab00a03c2e440'