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

[Kalpa Welivitigoda]

commit 344657a47cc363588ef6d483a661a4cf58a2bee8
Merge: 983a16c 17b2487
Author: Kalpa Pathum Welivitigoda <callkalpa at gmail.com>
Date:   Fri Dec 2 22:28:33 2011 +0530

    Merge branch 'master' into f16

 sugar-portfolio.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---