Merge from mainline.
authorSteinar H. Gunderson <sesse@rietz>
Sun, 17 Jun 2007 15:59:20 +0000 (15:59 +0000)
committerSteinar H. Gunderson <sesse@rietz>
Sun, 17 Jun 2007 15:59:20 +0000 (15:59 +0000)
1  2 
scanlib.pm

diff --cc scanlib.pm
Simple merge