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

[Kalpa Welivitigoda]

commit 983a16c58987d580b0aa76364bf0d0fc6243937f
Merge: 60edb36 258eca2
Author: Kalpa Pathum Welivitigoda <callkalpa at gmail.com>
Date:   Fri Dec 2 20:38:15 2011 +0530

    Merge branch 'master' into f16

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