r24722: Squashed commit ofthe following: 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>