Merge branch 'marek'
authorMarek Safar <marek.safar@gmail.com>
Fri, 29 Oct 2010 18:17:29 +0000 (19:17 +0100)
committerMarek Safar <marek.safar@gmail.com>
Fri, 29 Oct 2010 18:17:29 +0000 (19:17 +0100)
commitf212360d708424829d3e65fb1b0ae33849931e0a
tree69b0eefe825653e77e7f4093dda40d589621e1a4
parentdccf4cc6e56c2d774427217fc70431611d3cf86e
parent313bb63cc01b5bb46c5d53a61c87d37644375733
Merge branch 'marek'