[lemonpos/f16: 4/4] Merge branch 'master' into f16

[siddharths]

commit 24fe69f7cc3108167fd2fd4cee5790c7b5134668
Merge: 4cdc234 e92fad3
Author: Siddharth Sharma <siddharth.kde at gmail.com>
Date:   Sun Jul 15 20:14:43 2012 +0530

    Merge branch 'master' into f16

 .gitignore    |    1 +
 lemonpos.spec |   25 ++++++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)
---