Merge branch 'jn/rpm-updates'
authorJonas Fonseca <fonseca@diku.dk>
Sat, 2 Jun 2007 09:03:12 +0000 (11:03 +0200)
committerJonas Fonseca <fonseca@diku.dk>
Sat, 2 Jun 2007 09:04:04 +0000 (11:04 +0200)
commitcf63d30cbc4efb2bb87e52c4e54366751bb958fa
tree305d9f6e4d07c8ab2b38805f4c9e38832d0981b5
parent70a83764575d379f853ef0401269d52100ddd1e3
parentb253ee86a072bf5232ec674c6483e07c29806a64
Merge branch 'jn/rpm-updates'

Conflicts:

Makefile
Makefile