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

[Kalpa Welivitigoda]

commit 252f37bc9f5df819c18eb1b56900bb6935798be9
Merge: 9a5261e bb96367
Author: Kalpa Pathum Welivitigoda <callkalpa at gmail.com>
Date:   Mon Oct 10 22:32:25 2011 +0530

    Merge branch 'master' into f16

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