Merge branch 'marek'
authorMarek Safar <marek.safar@gmail.com>
Fri, 5 Nov 2010 22:56:38 +0000 (22:56 +0000)
committerMarek Safar <marek.safar@gmail.com>
Fri, 5 Nov 2010 22:56:38 +0000 (22:56 +0000)

Trivial merge