Commit fc36e13d5b8c8d6fcf831c3087a231fa7d5e2af5

Con Kolivas 2011-09-04T00:00:12

Merge branch 'master' into adl_support