[sugar-browse/f18: 2/2] Merge branch 'master' into f18

[Peter Robinson]

commit 538dc0aa8a97dfaced02ba300af6d7dcc2cb8ed9
Merge: 299adc2 628e0e6
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon May 20 20:23:07 2013 +0100

    Merge branch 'master' into f18

 sources           |    2 +-
 sugar-browse.spec |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
---