Merge commit 'krh/master'
authorJames Bowes <jbowes@redhat.com>
Mon, 23 Jun 2008 18:52:39 +0000 (14:52 -0400)
committerJames Bowes <jbowes@redhat.com>
Mon, 23 Jun 2008 18:52:39 +0000 (14:52 -0400)
commit298fd6434e6d144147ebf738db6cb09f5ac41095
tree7886e6ddfffa0951536422c6b178c6728a2d59b2
parent24d26c44455074dab13e5f20de9ca0a23b62edb7
parent3f712232b97aa72f7f3a6560443f5c8a7f22363e
Merge commit 'krh/master'