[cups/f13/master: 80/80] Merge branch 'f12' into f13

[Tim Waugh]

commit 5619b50ad01b0958644e9f5d3c4b24f77ba1f5dc
Merge: cc71076 09ebece
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Aug 3 13:31:49 2010 +0100

    Merge branch 'f12' into f13

 sources |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---