my changelog was in conflict, resolving this
authorMicah Anderson <micah@riseup.net>
Wed, 1 Nov 2006 21:40:46 +0000 (21:40 +0000)
committerMicah Anderson <micah@riseup.net>
Wed, 1 Nov 2006 21:40:46 +0000 (21:40 +0000)

No differences found