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

[Peter Robinson]

commit eb9249e52302f8b6fac9c81a6b7386396e78ceda
Merge: 9f088da 6bb2eb8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Mar 28 09:26:24 2013 +0000

    Merge branch 'master' into f18

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