[mate-backgrounds/f18: 2/2] Merge branch 'master' into f18

[leigh123linux]

commit f67854096919b3dd3a3b89e437aaeccea7db43dc
Merge: 42adaa5 b835acf
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 13 21:17:22 2012 +0000

    Merge branch 'master' into f18

 mate-backgrounds.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---