Merge branch 'marek'
authorMarek Safar <marek.safar@gmail.com>
Wed, 28 Jul 2010 14:32:30 +0000 (15:32 +0100)
committerMarek Safar <marek.safar@gmail.com>
Wed, 28 Jul 2010 14:32:30 +0000 (15:32 +0100)
commit7905bacfc2b4de6f2f5f5f1c060e28eb3f853426
tree6d1801fd43f159dd6b5110e67fc2f553758e6325
parent527c363398f8f6a2c12c04c1e4fe3d29c308fe06
parentcf99a95c8838e41b36a00a71d005e33af0559399
Merge branch 'marek'