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

[Kalpa Welivitigoda]

commit 74912a9c430155b2428e458210590d08066597f7
Merge: fb2e34a 8828ab2
Author: Kalpa Welivitigoda <callkalpa at gmail.com>
Date:   Fri Oct 26 21:59:05 2012 +0530

    Merge branch 'master' into f16

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