Commit 01455ee5e8152694cf3d5c927caae2d0844f4829

Con Kolivas 2014-02-21T12:39:19

Fix compilation error with two avalon types.