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

[alexlan]

commit afccb5e6998cd1101c0004c542d5c202242a5357
Merge: ccd07a5 9176b77
Author: Alex Lancaster <alex at delpy.biol.berkeley.edu>
Date:   Tue Mar 1 14:00:51 2011 -0500

    Merge branch 'master' into f14

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