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

[Peter Robinson]

commit 2108b9f8cbae58b1de2d52040df37ba0062a7761
Merge: 7c43596 12d2026
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jun 8 14:05:05 2011 +0100

    Merge branch 'master' into f15

 n2.patch   |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 sugar.spec |    9 +++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
---