merge fixes
commit2ab4a5965d8e60bc955e13be58f2d1a4ed39657a
authorAJ Rossini <blindglobe@gmail.com>
Sun, 31 Aug 2008 21:29:42 +0000 (31 23:29 +0200)
committerAJ Rossini <blindglobe@gmail.com>
Sun, 31 Aug 2008 21:29:42 +0000 (31 23:29 +0200)
tree79cd4efde189d6c395c456a7646c409c53f4d501
parent088bf78a95f6c28a5cf37edd8f63e0499f7b5329
parente277e35ffbc8dcabc6a54f8519c7a58096477296
merge fixes