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

[Kalpa Welivitigoda]

commit 367f0bbb37164d7251bc03b140735d52df089af9
Merge: 7842ab1 1784c1c
Author: Kalpa Pathum Welivitigoda <callkalpa at gmail.com>
Date:   Thu Jan 19 12:23:56 2012 +0530

    Merge branch 'master' into f16

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---