fixed merge with vichan-devel

my merge is better, because it conserves the commit information, yours does not