[alsa-lib/f18: 3/3] fix merge

[Peter Robinson]

commit 7165020cfeba6a14510a90604020744073431335
Merge: 05ffcc7 1e107db
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Dec 3 16:58:27 2012 +0000

    fix merge

 alsa-lib.spec |   58 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 25 deletions(-)
---