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

[Hans de Goede]

commit b18c2f654952c7251c4ad029b9404c28e158e0fb
Merge: 05c98be e07c633
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Jan 11 12:54:53 2011 +0100

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

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