[sugar-maze/f14: 2/2] Merge branch 'master' into f14

[Peter Robinson]

commit 2ca21d90e0caff6e84fc37d37f5df44beadac56f
Merge: cc50093 c615660
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Sep 19 19:35:32 2011 +0100

    Merge branch 'master' into f14

 .gitignore      |    1 +
 sources         |    2 +-
 sugar-maze.spec |   11 +++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)
---