Merge branch 'next'v0.96
commitd1a861fec2c64fb73d7799ffc25653bbd9e8bfc4
authorPerry Myers <pmyers@redhat.com>
Sat, 20 Dec 2008 01:04:34 +0000 (19 20:04 -0500)
committerPerry Myers <pmyers@redhat.com>
Sat, 20 Dec 2008 01:04:34 +0000 (19 20:04 -0500)
tree56887bb86340813f9b80339300ba518f66a21f12
parent186bdd5e6e3e8e44bcfeeecc3e49c7ea4a482c58
parent8e8f19e6950f846d0a9785ab26c06e321205cb5a
Merge branch 'next'