[gupnp-dlna/f16: 3/3] Merge branch 'master' into f16

[Peter Robinson]

commit 475e76981a4c36a666889d97a2797db420d308fa
Merge: 09d9b76 3a1cfc5
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jan 23 23:21:04 2012 +0000

    Merge branch 'master' into f16

 gupnp-dlna.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---