[sugar/f16: 2/2] Merge branch 'master' into f16

[Peter Robinson]

commit 210bb3d6bb8cea085cf1196a6b7f7a95eab07faf
Merge: e97ff0b f1dc215
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Oct 19 11:55:22 2011 +0100

    Merge branch 'master' into f16

 sources    |    2 +-
 sugar.spec |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---