commit 9e097a26e93e1b7527ab1c9ee9f8de9217efa7a4 Merge: c83a51f b835acf Author: Dan Mashal <dan.mashal at gmail.com> Date: Sun Nov 25 18:30:25 2012 -0800 Merge branch 'master' into f16 .gitignore | 1 + mate-backgrounds.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) ---