commit f9109822d15bd5f55f3d629dc5674df2066e160b Merge: 505dbc4 121c96b Author: Matt Domsch <Matt_Domsch at dell.com> Date: Sun Oct 10 17:32:24 2010 -0500 finish merge .gitignore | 3 ++- firmware-tools.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) ---