Changed labs to llabs -- an int64_t is best approximated by a long long, not a long.
Merge branch 'sam_fix_build' into next
Merge branch 'next' into sam_cache_includes