[maniadrive/f13/master: 2/2] Merge remote branch 'origin/master' into f13/master

[Hans de Goede]

commit 9cfc8f19ba69c4b5979977a12f25d3705c595ba7
Merge: 5f3f6a0 e07c633
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Jan 11 12:56:16 2011 +0100

    Merge remote branch 'origin/master' into f13/master

 ...rive-1.2-fix-modifying-php-strings-inline.patch |  121 ++++++++++++++++++++
 maniadrive.spec                                    |    9 +-
 2 files changed, 128 insertions(+), 2 deletions(-)
---