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

[Kalpa Welivitigoda]

commit 2b66b32362af4ececec534bd90818cb29182ab16
Merge: 8400e78 8f30f38
Author: Kalpa Pathum Welivitigoda <callkalpa at gmail.com>
Date:   Wed Feb 29 23:37:52 2012 +0530

    Merge branch 'master' into f15

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