Merge remote branch 'origin'
authorJohan Dahlin <johan@gnome.org>
Wed, 10 Mar 2010 15:01:15 +0000 (12:01 -0300)
committerJohan Dahlin <johan@gnome.org>
Wed, 10 Mar 2010 15:01:15 +0000 (12:01 -0300)
commit2cc9735150c79f71f3fc7f4750a7d3632253f474
tree8230af4e1733cb39d09a11bddc8103ff61b1edd1
parentab2da23f4793016bfe4b2b327ddf6e10a94ea907
parent8d8f78bfd2278ba10aea0a60b96ba9d52e292a7f
Merge remote branch 'origin'