[cups/f14/master: 2/2] Merge branch 'f13' into f14

[Jiří Popelka]

commit b6d77d523b2161a80201358450298e0fd082a1f6
Merge: ac9a4ac 948534f
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Feb 10 10:43:59 2011 +0100

    Merge branch 'f13' into f14

 cups-usb-buffer-size.patch |   22 ----------------------
 cups.spec                  |   10 +++++-----
 2 files changed, 5 insertions(+), 27 deletions(-)
---