Merge branch 'marek'
commit161ee3d54aa1cb35d91f2c7d400c47d677459951
authorMarek Safar <marek.safar@gmail.com>
Tue, 14 Sep 2010 14:43:43 +0000 (14 15:43 +0100)
committerMarek Safar <marek.safar@gmail.com>
Tue, 14 Sep 2010 14:43:43 +0000 (14 15:43 +0100)
tree368324be8384ff3193c112bac331b9ebdfc05f04
parent682e52541d5c45b5f9c0d974e2ce4f340c2d8cf5
parent6d57da03107b86568c2c0e21e94fb0e85dfc0469
Merge branch 'marek'