Merge branch 'bitmasks'
authorSøren Sandmann Pedersen <sandmann@redhat.com>
Sat, 13 Feb 2010 17:26:09 +0000 (12:26 -0500)
committerSøren Sandmann Pedersen <sandmann@redhat.com>
Sat, 13 Feb 2010 17:26:09 +0000 (12:26 -0500)

Trivial merge