[sugar-browse/f14: 4/4] Merge branch 'master' into f14

[Peter Robinson]

commit 9685b73c297227321744ee906346ae1a8a113e08
Merge: b2826e9 2b2cf59
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat May 28 21:40:15 2011 +0100

    Merge branch 'master' into f14

 .gitignore        |    1 +
 sources           |    2 +-
 sugar-browse.spec |   16 ++++++++++------
 3 files changed, 12 insertions(+), 7 deletions(-)
---