Merge commit 'fdo/master'
authorKristian Høgsberg <krh@redhat.com>
Sat, 28 Jun 2008 23:22:55 +0000 (19:22 -0400)
committerKristian Høgsberg <krh@redhat.com>
Sat, 28 Jun 2008 23:22:55 +0000 (19:22 -0400)
1  2 
librazor/razor.c

Simple merge