r24722: Squashed commit of thefollowing: Author: Gerald Carter <coffeedude@plainjoe.org> Author: Gerald Carter <coffeedude@plainjoe.org> Author: Gerald Carter <coffeedude@plainjoe.org> Author: Gerald Carter <coffeedude@plainjoe.org> Author: Gerald Carter <coffeedude@plainjoe.org>