Revert this changes, to undo some mess up on May 19, 2013

This reverts commit aea33fce0392e0d872ae62acbb22f74f7e512dd3.
Undoing some mess-up on May 19, 2013

This reverts commit 6cc743e72b00ef6bd95f3b2fa73e11abb19774f0.
Undoing a mess-up on May 19, 2013

This reverts commit aea33fce0392e0d872ae62acbb22f74f7e512dd3.

Conflicts:
	src/main.cpp
	src/pcb-probe.cpp