That last one worked for less than a day! I (Chris) finally have EMC2 running on my machine so I have a little more to work with. This patch should apply to the 20050613 snapshot successfully.
(originally posted on the AXIS blog)