[Upstream Migration r61412] Merge branch 'upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 11 Aug 2011 07:44:50 +0000 (16:44 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 11 Aug 2011 07:46:36 +0000 (16:46 +0900)
commitea7e7a29deedb3f82b4b49c91e6a7596ed1d8cdd
tree026ae3ea67603227edf9f998413520cb31776c44
parent2ab93ab627fc19441ba9aa7cbfa98466321aa059
parentff1f3f1f7797a3b2d29719564d89071be491fe87
[Upstream Migration r61412] Merge branch 'upstream'

Conflicts:
src/lib/eina_file.c
src/lib/eina_share_common.c