This one got renamed, complicating the merge a bit...this should restore
it to its intended state.
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>