Merge branch 'master' of t61p:/home/dpavlin/klin/Printer-EVOLIS/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 14 Aug 2010 22:57:34 +0000 (00:57 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 14 Aug 2010 22:57:34 +0000 (00:57 +0200)

Trivial merge