missed a merge conflict
authorBdale Garbee <bdale@gag.com>
Sun, 15 Feb 2009 17:21:10 +0000 (10:21 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 15 Feb 2009 17:21:10 +0000 (10:21 -0700)
commitcdd3d7b10c6e50c809b55b3ea7ce11cb1822a17d
tree870155aa0f495ef843da84b9604f49acb8edb1ec
parent0606f9ff05867b5ff410c38bb7354563fff7ea31
missed a merge conflict
mtx.spec.in