[tellico/f14: 4/4] Merge branch 'master' into f14

[alexlan]

commit 8e2846fd620dd2a99d52994e8c5336923d7d87c7
Merge: afccb5e f13acd9
Author: Alex Lancaster <alexlan at fedoraproject.org>
Date:   Mon Sep 5 00:33:00 2011 -0400

    Merge branch 'master' into f14

 .gitignore       |    1 +
 gcc-4.6-fix.diff |   25 -------------------------
 libv4l1.diff     |   14 --------------
 sources          |    2 +-
 tellico.spec     |   18 ++++++++++++------
 5 files changed, 14 insertions(+), 46 deletions(-)
---