Merge branch 'many-pixels'
authorSøren Sandmann Pedersen <sandmann@redhat.com>
Thu, 4 Jun 2009 01:49:59 +0000 (21:49 -0400)
committerSøren Sandmann Pedersen <sandmann@redhat.com>
Thu, 4 Jun 2009 01:49:59 +0000 (21:49 -0400)

Trivial merge