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

[Kalpa Welivitigoda]

commit 7842ab19109e41839bb3f48caa1463b93a879f59
Merge: 344657a d99b373
Author: Kalpa Pathum Welivitigoda <callkalpa at gmail.com>
Date:   Thu Jan 19 12:14:02 2012 +0530

    Merge branch 'master' into f16

 sugar-portfolio.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---