Merge branch 'work'
authorBenjamin Otte <otte@redhat.com>
Wed, 10 Mar 2010 19:52:06 +0000 (20:52 +0100)
committerBenjamin Otte <otte@redhat.com>
Wed, 10 Mar 2010 19:52:06 +0000 (20:52 +0100)
commit7022923326771f2e59314733c85b1add0d11bf5a
tree5cc1339500d38465091450b0c7d00d3af1b9c0dd
parent121640cceccde455d05f471c7f794a2877bfa0d8
parenta9d1a493a79d72ac5fbe578bc8160f0637c69619
Merge branch 'work'