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

[Peter Robinson]

commit b2826e9bd7efd29a38dd8544245abd192133ffed
Merge: e5dfe54 9bdf99d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 25 08:08:08 2010 +0100

    Merge branch 'master' into f14

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