[sugar-portfolio/f15: 2/2] Merge branch 'master' into f15

[Kalpa Welivitigoda]

commit e7e57609e08f8a4273531dffee02c69e1e9546e8
Merge: f4fc05f f557507
Author: Kalpa Welivitigoda <callkalpa at gmail.com>
Date:   Sun Jun 24 07:37:00 2012 +0530

    Merge branch 'master' into f15

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