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

[Kalpa Welivitigoda]

commit 0a565f880b0700c9dcbc75844424ef4ab07b0104
Merge: 2b66b32 7ce86f1
Author: Kalpa Welivitigoda <callkalpa at gmail.com>
Date:   Thu May 17 21:10:47 2012 +0530

    Merge branch 'master' into f15

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