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

[Peter Robinson]

commit 9f088dafc5d5b137e104ac32c65266f3da50598a
Merge: a2013e6 b9ef9ba
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Dec 10 20:16:25 2012 +0000

    Merge branch 'master' into f18

 .gitignore        |    1 -
 sources           |    2 +-
 sugar-browse.spec |   11 +++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)
---