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

[Kalpa Welivitigoda]

commit 90e3a4bd8141b5c82558cea92d2fe52147fee617
Merge: 4b4bcaa f557507
Author: Kalpa Welivitigoda <callkalpa at gmail.com>
Date:   Sun Jun 24 07:35:05 2012 +0530

    Merge branch 'master' into f16

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