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

[Peter Robinson]

commit 7c43596e3f7688d90fcb453af519287d9733b22b
Merge: 0896483 ea6190d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue May 24 21:07:24 2011 +0100

    Merge branch 'master' into f15

 sugar-nm09-new.patch |  660 ++++++++++++++++++++++++++++++++++++++++++++++++++
 sugar.spec           |    7 +-
 2 files changed, 666 insertions(+), 1 deletions(-)
---