merged! the beauty of open source, er... source available software ;)