Merge branch 'krh/master'
authorJames Bowes <jbowes@redhat.com>
Fri, 20 Jun 2008 23:04:06 +0000 (19:04 -0400)
committerJames Bowes <jbowes@redhat.com>
Fri, 20 Jun 2008 23:04:47 +0000 (19:04 -0400)
commitc778afefaa189c6aa8437fc00512f140a6a68efe
tree2b62b297754d70db03ff990c5d196f696aa34976
parent08973b4c9c22a4dcbed220daa38fcf510ba9146d
parente557f97da15b1682b2e9854672b019485bc48362
Merge branch 'krh/master'

Conflicts:

librazor/razor.h
librazor/rpm.c
razor.c
src/main.c
data/bash-completion.sh
librazor/importer.c
librazor/razor-internal.h
librazor/razor.c
librazor/razor.h
librazor/root.c
librazor/rpm.c
src/import-rpmdb.c
src/import-yum.c
src/main.c
src/test-driver.c