Merge remote-tracking branch 'jlentfer/foomatic' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Jun 2012 18:27:19 +0000 (20:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Jun 2012 18:27:19 +0000 (20:27 +0200)

Trivial merge