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

[Kalpa Welivitigoda]

commit 4b4bcaaacf601b3787b7aac97b13e295162b4ec1
Merge: 8a91691 30b009a
Author: Kalpa Welivitigoda <callkalpa at gmail.com>
Date:   Thu May 24 20:20:22 2012 +0530

    Merge branch 'master' into f16

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