Merge branch '2lib'
commitd4eb5320b1e4bd673ab13c4c8ada86cb28e5dddc
authorPetr Baudis <pasky@ucw.cz>
Sun, 29 May 2011 15:49:16 +0000 (29 17:49 +0200)
committerPetr Baudis <pasky@ucw.cz>
Sun, 29 May 2011 15:49:16 +0000 (29 17:49 +0200)
treef3e9225c5b9446b6deecf25d1ed822e550a37d50
parent2a4c4e18e3a6ea790ecba5a395870a982a4d44f0
parent480cef8ef63aa71f523f27bbc7d180711b815320
Merge branch '2lib'