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

[Kalpa Welivitigoda]

commit 8400e783b514f306cb1ebc1320c9e61daab192d5
Merge: a30e407 1784c1c
Author: Kalpa Pathum Welivitigoda <callkalpa at gmail.com>
Date:   Thu Jan 19 12:24:43 2012 +0530

    Merge branch 'master' into f15

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