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

Trivial merge