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)

Trivial merge